[Firebird-checkins] CVS: firebird2/src/jrd alt_use_sec.h,1.5,1.6 build_no.h,1.5,1.6 cmp.cpp,1.7,1.8 isc.cpp,1.9,1.10 isc_win32.cpp,1.3,1.4 met.epp,1.11,1.12 met_proto.h,1.4,1.5

[Mark O. <sky...@us...>]

Update of /cvsroot/firebird/firebird2/src/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv24618/src/jrd

Modified Files:
	alt_use_sec.h build_no.h cmp.cpp isc.cpp isc_win32.cpp met.epp 
	met_proto.h 
Log Message:
Changes for rebuild of fb2.


Index: alt_use_sec.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/alt_use_sec.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U3 -r1.5 -r1.6

Index: build_no.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/build_no.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U3 -r1.5 -r1.6
--- build_no.h	1 Jul 2002 15:07:18 -0000	1.5
+++ build_no.h	4 Jul 2002 09:34:19 -0000	1.6
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:421 
+  FORMAL BUILD NUMBER:442 
 */
 
-#define PRODUCT_VER_STRING "2.0.0.421"
-#define FILE_VER_STRING "WI-T2.0.0.421"
-#define LICENSE_VER_STRING "WI-T2.0.0.421"
-#define FILE_VER_NUMBER 2, 0, 0, 421
+#define PRODUCT_VER_STRING "2.0.0.442"
+#define FILE_VER_STRING "WI-T2.0.0.442"
+#define LICENSE_VER_STRING "WI-T2.0.0.442"
+#define FILE_VER_NUMBER 2, 0, 0, 442
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "421"
+#define FB_BUILD_NO "442"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird2 Dev1"

Index: cmp.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/cmp.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -U3 -r1.7 -r1.8
--- cmp.cpp	29 Jun 2002 13:00:56 -0000	1.7
+++ cmp.cpp	4 Jul 2002 09:34:19 -0000	1.8
@@ -75,6 +75,7 @@
 #include "../jrd/scl_proto.h"
 #include "../jrd/thd_proto.h"
 #include "../jrd/met_proto.h"
+#include "../jrd/mov_proto.h"
 #include "../jrd/dsc_proto.h"
 #include "../jrd/dbg_proto.h"	/* DBG_supervisor */
 
@@ -5355,7 +5356,7 @@
 						if (!strcmp(access->acc_type, object_column)
 							&& MET_relation_owns_trigger(tdbb, access->acc_name, access->acc_trg_name)
 							&& (MET_lookup_field(tdbb, owner_relation, access->acc_name, access->acc_security_name) >= 0
-							|| MET_relation_default_class(tdbb, owner_relation, access->acc_security_name)))
+							|| MET_relation_default_class(tdbb, owner_relation->rel_name, access->acc_security_name)))
 							continue;
 					}
 					/* Inherited access needs from "object" to acc_security_name */
@@ -5382,7 +5383,7 @@
 							continue;
 						if (!strcmp(access->acc_type, object_column)
 							&& (MET_lookup_field(tdbb, owner_relation, access->acc_name, access->acc_security_name) >= 0
-							|| MET_relation_default_class(tdbb, owner_relation, access->acc_security_name)))
+							|| MET_relation_default_class(tdbb, owner_relation->rel_name, access->acc_security_name)))
 							continue;
 					}
 					/* A direct access to an object from this trigger */

Index: isc.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/isc.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -U3 -r1.9 -r1.10
--- isc.cpp	2 Jul 2002 09:49:19 -0000	1.9
+++ isc.cpp	4 Jul 2002 09:34:19 -0000	1.10
@@ -51,7 +51,6 @@
 #include "../jrd/gds_proto.h"
 #include "../jrd/isc_proto.h"
 #include "../jrd/jrd_proto.h"
-#include "../utilities/registry.h"
 
 /* Initialize the structure that hold all the config information */
 

Index: isc_win32.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/isc_win32.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- isc_win32.cpp	24 Dec 2001 02:50:51 -0000	1.3
+++ isc_win32.cpp	4 Jul 2002 09:34:19 -0000	1.4
@@ -42,6 +42,7 @@
 #include "../jrd/gds_proto.h"
 #include "../jrd/isc_proto.h"
 #include "../jrd/jrd_proto.h"
+#include "../utilities/registry.h"
 
 
 #include <windows.h>

Index: met.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/met.epp,v
retrieving revision 1.11
retrieving revision 1.12
diff -U3 -r1.11 -r1.12
--- met.epp	1 Jul 2002 16:59:09 -0000	1.11
+++ met.epp	4 Jul 2002 09:34:19 -0000	1.12
@@ -2709,8 +2709,8 @@
 }
 
 
-BOOLEAN MET_relation_owns_trigger (TDBB tdbb, TEXT *relation_name, 
-                                   TEXT *trigger_name)
+BOOLEAN MET_relation_owns_trigger (TDBB tdbb, const TEXT *relation_name, 
+                                   const TEXT *trigger_name)
 {
 /**************************************
  *
@@ -2767,8 +2767,8 @@
     return found;
 }
 
-BOOLEAN MET_relation_default_class (TDBB tdbb, TEXT *relation_name,
-                                    TEXT *default_security_class_name)
+BOOLEAN MET_relation_default_class (TDBB tdbb, const TEXT *relation_name,
+                                    const TEXT *default_security_class_name)
 {
 /**************************************
  *

Index: met_proto.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/met_proto.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -U3 -r1.4 -r1.5
--- met_proto.h	1 Jul 2002 16:59:09 -0000	1.4
+++ met_proto.h	4 Jul 2002 09:34:19 -0000	1.5
@@ -72,8 +72,8 @@
 void MET_prepare(TDBB, struct tra *, USHORT, UCHAR *);
 struct prc *MET_procedure(TDBB, int, USHORT);
 struct rel *MET_relation(TDBB, USHORT);
-extern BOOLEAN 		MET_relation_owns_trigger (TDBB, TEXT *, TEXT *);
-extern BOOLEAN		MET_relation_default_class (TDBB, TEXT *, TEXT *);
+extern BOOLEAN 		MET_relation_owns_trigger (TDBB, const TEXT *, const TEXT *);
+extern BOOLEAN		MET_relation_default_class (TDBB, const TEXT *, const TEXT *);
 void MET_release_existence(struct rel *);
 void MET_release_triggers(TDBB, VEC *);
 void MET_remove_procedure(TDBB, int, PRC);