[Firebird-checkins] CVS: firebird2/src/jrd blp.h, 1.20, 1.20.4.1 gds.cpp, 1.193, 1.193.2.1

[Dmitry Y. <di...@us...>]

Build Version :  T2.1.0.13671 Firebird 2.1 Unstable

(writeBuildNum.sh,v 1.13826 2006/07/31 08:00:42 dimitr Exp  )

Update of /cvsroot/firebird/firebird2/src/jrd
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23639

Modified Files:
      Tag: B2_0_Release
	blp.h gds.cpp 
Log Message:
Updated the BLR printer to handle all FB2 features.

Index: blp.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/blp.h,v
retrieving revision 1.20
retrieving revision 1.20.4.1
diff -b -U3 -r1.20 -r1.20.4.1
--- blp.h	7 Feb 2006 08:08:45 -0000	1.20
+++ blp.h	31 Jul 2006 08:00:40 -0000	1.20.4.1
@@ -193,9 +193,9 @@
 	{"user_savepoint", user_savepoint},
 	{"dcl_cursor", dcl_cursor},
 	{"cursor_stmt", cursor_stmt},
+	{"current_timestamp2", byte},
+	{"current_time2", byte},
 	// These verbs were added in 6.0, primarily to support 64-bit integers, now obsolete
-	{"agg_total_distinct2", one},
-	{"agg_average2", one},
 	{"agg_average_distinct2", one},	// 170
 	{"average2", two}, 
 	{"gen_id2", gen_id}, 

Index: gds.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/gds.cpp,v
retrieving revision 1.193
retrieving revision 1.193.2.1
diff -b -U3 -r1.193 -r1.193.2.1
--- gds.cpp	6 Apr 2006 06:32:47 -0000	1.193
+++ gds.cpp	31 Jul 2006 08:00:40 -0000	1.193.2.1
@@ -386,7 +386,7 @@
 	extract[]	= { op_line, op_byte, op_verb, 0},
 	user_savepoint[]	= { op_byte, op_byte, op_literal, op_line, 0},
 	exec_into[] = { op_word, op_line, op_indent, op_exec_into, 0},
-	dcl_cursor[] = { op_word, op_line, op_verb, 0},
+	dcl_cursor[] = { op_word, op_line, op_verb, op_indent, op_word, op_line, op_args, 0},
 	cursor_stmt[] = { op_cursor_stmt, 0 },
 	strlength[] = { op_byte, op_line, op_verb, 0},
 	trim[] = { op_byte, op_byte, op_line, op_verb, 0};