From c6ee6f07959e974439cf5bd467fdcfbd31831d05 Mon Sep 17 00:00:00 2001
From: dimitr <dimitr@users.sourceforge.net>
Date: Mon, 23 Dec 2002 11:23:07 +0000
Subject: [PATCH] Removed unused BLR codes. This code space should be reused
 later.

---
 src/jrd/blr.h   | 17 -----------------
 src/jrd/par.cpp | 15 ++-------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/jrd/blr.h b/src/jrd/blr.h
index 39e6a76eff..53d41e4d3f 100644
--- a/src/jrd/blr.h
+++ b/src/jrd/blr.h
@@ -270,21 +270,6 @@
 #define blr_current_timestamp	(unsigned char)161
 #define blr_current_time	(unsigned char)162
 
-
-/* These verbs were added in 6.0, primarily to support 64-bit integers */
-
-#define blr_add2			(unsigned char)163
-#define blr_subtract2		(unsigned char)164
-#define blr_multiply2		(unsigned char)165
-#define blr_divide2			(unsigned char)166
-#define blr_agg_total2		(unsigned char)167
-#define blr_agg_total_distinct2	(unsigned char)168
-#define blr_agg_average2	(unsigned char)169
-#define blr_agg_average_distinct2	(unsigned char)170
-#define blr_average2		(unsigned char)171
-#define blr_gen_id2			(unsigned char)172
-#define blr_set_generator2	(unsigned char)173
-
 /* FB1 specific BLR */
 
 #define blr_current_role	(unsigned char)174
@@ -302,5 +287,3 @@
 #define blr_undo_savepoint	(unsigned char)181
 
 #endif /* _JRD_BLR_H_ */
-
-
diff --git a/src/jrd/par.cpp b/src/jrd/par.cpp
index 8f0c7b7b66..34ddb5690d 100644
--- a/src/jrd/par.cpp
+++ b/src/jrd/par.cpp
@@ -34,7 +34,7 @@
  *
  */
 /*
-$Id: par.cpp,v 1.29 2002-12-10 11:53:49 eku Exp $
+$Id: par.cpp,v 1.30 2002-12-23 11:23:07 dimitr Exp $
 */
 
 #include "firebird.h"
@@ -2323,10 +2323,6 @@ static JRD_NOD parse(TDBB tdbb, register CSB * csb, USHORT expected)
 	case blr_subtract:
 	case blr_multiply:
 	case blr_divide:
-	case blr_add2:
-	case blr_subtract2:
-	case blr_multiply2:
-	case blr_divide2:
 	case blr_concatenate:
 
 	case blr_assignment:
@@ -2349,10 +2345,6 @@ static JRD_NOD parse(TDBB tdbb, register CSB * csb, USHORT expected)
 	case blr_agg_count_distinct:
 	case blr_agg_total_distinct:
 	case blr_agg_average_distinct:
-	case blr_agg_total2:
-	case blr_agg_average2:
-	case blr_agg_total_distinct2:
-	case blr_agg_average_distinct2:
 	case blr_post:
 	case blr_exec_sql:
 	case blr_internal_info:
@@ -2484,8 +2476,6 @@ static JRD_NOD parse(TDBB tdbb, register CSB * csb, USHORT expected)
 
 	case blr_gen_id:
 	case blr_set_generator:
-	case blr_gen_id2:
-	case blr_set_generator2:
 		{
 			SLONG tmp;
 			TEXT name[32];
@@ -2501,7 +2491,7 @@ static JRD_NOD parse(TDBB tdbb, register CSB * csb, USHORT expected)
             /* CVC: There're thousand ways to go wrong, but I don't see any value
                in posting dependencies with set generator since it's DDL, so I will
                track only gen_id() in both dialects. */
-            if ((operator_ == blr_gen_id || operator_ == blr_gen_id2)
+            if ((operator_ == blr_gen_id)
                 && ((*csb)->csb_g_flags & csb_get_dependencies)) {
                 JRD_NOD dep_node = PAR_make_node (tdbb, e_dep_length);
                 dep_node->nod_type = nod_dependency;
@@ -2703,7 +2693,6 @@ static JRD_NOD parse(TDBB tdbb, register CSB * csb, USHORT expected)
     case blr_count2:
 */
 	case blr_average:
-	case blr_average2:
 	case blr_total:
 	case blr_from:
 	case blr_via: