Firebird

Build Version :  T1.5.0.1842 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1825 2002/12/29 23:04:03 fsg Exp $ )

Update of /cvsroot/firebird/firebird2
In directory sc8-pr-cvs1:/tmp/cvs-serv15138/firebird2

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/firebird2/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -b -U3 -r1.90 -r1.91
--- ChangeLog	28 Dec 2002 23:02:57 -0000	1.90
+++ ChangeLog	29 Dec 2002 23:04:01 -0000	1.91
@@ -1,3 +1,66 @@
+2002-12-29 23:26  arnobrinkman
+
+	* firebird2/src/dsql/dsql.cpp:
+	
+	bugfix: PLAN wasn't correctly returned. bug probable introduced by
+	c to c++ port.
+
+2002-12-29 16:34  nmcc
+
+	* firebird2/src/jrd/isc_file.cpp:
+	
+	Put back useful comment lost in code cleanup.
+
+2002-12-29 16:29  nmcc
+
+	* firebird2/src/jrd/ib_stdio.h:
+	
+	Avoid ib_stdio on all Solaris platforms.
+
+2002-12-29 16:23  nmcc
+
+	* firebird2/src/jrd/common.h:
+	
+	Remove test for HP10 from middle of sun/Solaris block.
+
+2002-12-29 15:59  nmcc
+
+	* firebird2/builds/posix/Makefile.in.firebird:
+	
+	Do not replace users exisiting LD_LIBRARY_PATH
+
+2002-12-29 15:18  nmcc
+
+	* firebird2/builds/posix/Makefile.in.refDatabases:
+	
+	Remove any existing link otherwise ln fails on Solaris.
+
+2002-12-29 15:15  nmcc
+
+	* firebird2/configure.in:
+	
+	Update Solaris Sparc options.
+
+2002-12-29 14:28  nmcc
+
+	* firebird2/src/jrd/why.cpp:
+	
+	Add Solaris to list not supporting V3 databases via bridge code.
+
+2002-12-29 02:45  nmcc
+
+	* firebird2/src/burp/restore.epp:
+	
+	Fix new compiler error in sparc specific code.
+
+2002-12-29 02:38  nmcc
+
+	* firebird2/builds/posix/: Makefile.in.extlib, make.rules,
+	prefix.darwin, prefix.freebsd, prefix.linux, prefix.mingw,
+	prefix.sinixz:
+	
+	Move platform specific ld option to platform makefiles.
+
 2002-12-28 01:20  arnobrinkman
 
 	* firebird2/src/jrd/opt.cpp:

Build Version :  T1.5.0.1841 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1824 2002/12/29 22:26:36 arnobrinkman )

Update of /cvsroot/firebird/firebird2/src/dsql
In directory sc8-pr-cvs1:/tmp/cvs-serv29454

Modified Files:
	dsql.cpp 
Log Message:
bugfix: PLAN wasn't correctly returned. bug probable introduced by c to c++ port.

Index: dsql.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/dsql/dsql.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -b -U3 -r1.36 -r1.37
--- dsql.cpp	16 Dec 2002 15:37:31 -0000	1.36
+++ dsql.cpp	29 Dec 2002 22:26:35 -0000	1.37
@@ -31,9 +31,6 @@
  * 2002.10.29 Sean Leyne - Removed obsolete "Netware" port
  *
  */
-/*
-$Id$
-*/
 /**************************************************************
 V4 Multi-threading changes.
 
@@ -1666,14 +1663,17 @@
 				length =
 					get_plan_info(request, (SSHORT) sizeof(buffer), reinterpret_cast<SCHAR**>(&buffer_ptr));
 
-				if (length)
-					info = put_item(item, length, buffer, info, end_info);
+				if (length) {
+					info = put_item(item, length, buffer_ptr, info, end_info);
+				}
 
-				if (length > sizeof(buffer))
+				if (length > sizeof(buffer)) {
 					gds__free(buffer_ptr);
+				}
 
-				if (!info)
+				if (!info) {
 					return return_success();
+				}
 			}
 			else if (!message ||
 				 	(item != gds_info_sql_num_variables

Build Version :  T1.5.0.1840 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1823 2002/12/29 15:34:58 nmcc Exp $ )

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

Modified Files:
	isc_file.cpp 
Log Message:
Put back useful comment lost in code cleanup.


Index: isc_file.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/isc_file.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -b -U3 -r1.34 -r1.35
--- isc_file.cpp	10 Dec 2002 11:53:49 -0000	1.34
+++ isc_file.cpp	29 Dec 2002 15:34:57 -0000	1.35
@@ -1663,6 +1663,16 @@
  *	Get ALL mount points.
  *
  **************************************/
+	
+/* Solaris uses this because:
+	Since we had to substitute an alternative for the stdio supplied
+	with Solaris, we cannot use the getmntent() library call which
+	wants a Solaris stdio FILE* as an argument, so we parse the text-
+	type /etc/mnttab file ourselves.     - from FB1
+	
+	This will still apply with SFIO on FB2.  nmcc Dec2002
+*/
+	
 	TEXT device[128], mount_point[128], type[16], rw[128], foo1[16], *p, *q;
 	SSHORT n;

Build Version :  T1.5.0.1839 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1822 2002/12/29 15:29:49 nmcc Exp $ )

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

Modified Files:
	ib_stdio.h 
Log Message:
Avoid ib_stdio on all Solaris platforms.


Index: ib_stdio.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/ib_stdio.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -U3 -r1.3 -r1.4
--- ib_stdio.h	28 Nov 2002 15:42:03 -0000	1.3
+++ ib_stdio.h	29 Dec 2002 15:29:48 -0000	1.4
@@ -107,7 +107,7 @@
  * for stdio.
  */
 
-#ifdef SOLX86
+#ifdef SOLARIS
 #error SUN
 #endif

Build Version :  T1.5.0.1838 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1821 2002/12/29 15:23:47 nmcc Exp $ )

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

Modified Files:
	common.h 
Log Message:
Remove test for HP10 from middle of sun/Solaris block.


Index: common.h
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/common.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -b -U3 -r1.51 -r1.52
--- common.h	18 Nov 2002 07:57:41 -0000	1.51
+++ common.h	29 Dec 2002 15:23:46 -0000	1.52
@@ -324,6 +324,9 @@
    so many times I suggest stdIO from 
    http://www.research.att.com/sw/tools/sfio/ 
 */       
+/* 	Need to use full sfio not just stdio emulation to fix
+	file descriptor number limit. nmcc Dec2002
+*/
 #ifndef SFIO
 #define NEED_IB_STDIO
 #endif
@@ -358,12 +361,11 @@
 
 **********/
 
-#if !(defined(SOLARIS26) || defined(HP10))
-//#ifndef SOLARIS26
+#ifndef SOLARIS26
 
 /* If our build platform is at least Solaris release 2.6, then unistd.h
    declares these functions, so we must not define them with macros. 
-   The same applies to HP10 16-Apr-2002 Paul Beach */
+*/
 
 #define setreuid(ruid,euid)     ((setuid (ruid) == -1 || seteuid (euid) == -1) ? -1 : 0)
 #define setregid(rgid,egid)     ((setgid (rgid) == -1 || setegid (egid) == -1) ? -1 : 0)

Build Version :  T1.5.0.1837 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1820 2002/12/29 14:59:42 nmcc Exp $ )

Update of /cvsroot/firebird/firebird2/builds/posix
In directory sc8-pr-cvs1:/tmp/cvs-serv24966/builds/posix

Modified Files:
	Makefile.in.firebird 
Log Message:
Do not replace users exisiting LD_LIBRARY_PATH 


Index: Makefile.in.firebird
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.firebird,v
retrieving revision 1.23
retrieving revision 1.24
diff -b -U3 -r1.23 -r1.24
--- Makefile.in.firebird	22 Dec 2002 19:45:45 -0000	1.23
+++ Makefile.in.firebird	29 Dec 2002 14:59:40 -0000	1.24
@@ -43,14 +43,15 @@
 ISC_PASSWORD=	masterkey
 #LD_LIBRARY_PATH=/home/odonohue/src/firebird2/gen/firebird/lib:/usr/lib
 TEST_PATH = @FIREBIRD_BUILD_DIR@
-LD_LIBRARY_PATH=$(RealFirebirdPath)/lib
+# Firebird libs path set at link time (-R) so do not override local requirements - nmcc 28/12/2002
+#LD_LIBRARY_PATH=$(RealFirebirdPath)/lib
 
 #export ISC_USER
 #export ISC_PASSWORD
 #export INTERBASE
 export FIREBIRD
 export DYLD_FRAMEWORK_PATH
-export LD_LIBRARY_PATH
+#export LD_LIBRARY_PATH
 
 ######################################################################
 ###########  Build process overview  #################################

Build Version :  T1.5.0.1836 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1819 2002/12/29 14:18:22 nmcc Exp $ )

Update of /cvsroot/firebird/firebird2/builds/posix
In directory sc8-pr-cvs1:/tmp/cvs-serv11522/builds/posix

Modified Files:
	Makefile.in.refDatabases 
Log Message:
Remove any existing link otherwise ln fails on Solaris.


Index: Makefile.in.refDatabases
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.refDatabases,v
retrieving revision 1.9
retrieving revision 1.10
diff -b -U3 -r1.9 -r1.10
--- Makefile.in.refDatabases	9 Dec 2002 01:38:13 -0000	1.9
+++ Makefile.in.refDatabases	29 Dec 2002 14:18:21 -0000	1.10
@@ -74,6 +74,7 @@
 # of .epp files require to compile is yachts.lnk. MOD 05-Aug-2002
 
 yachts.lnk: empty.gdb
+	$(RM) -f yachts.lnk
 	ln -fs $(SRC_ROOT)/empty.gdb yachts.lnk
 
 
@@ -91,6 +92,7 @@
 	chmod 444 $@
 
 help.gdb:	$(FIREBIRD)/help/help.gdb
+	$(RM) -f $@
 	ln -fs $^ $@
 
 $(FIREBIRD)/help/help.gdb:	$(SRC_ROOT)/misc/help.gbak
@@ -99,6 +101,7 @@
 	chmod 444 $@
 
 isc4.gdb:	$(FIREBIRD)/isc4.gdb
+	$(RM) -f $@
 	ln -fs $^ $@
 
 $(FIREBIRD)/isc4.gdb:	$(SRC_ROOT)/misc/isc4.gbak

Build Version :  T1.5.0.1835 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1818 2002/12/29 14:15:51 nmcc Exp $ )

Update of /cvsroot/firebird/firebird2
In directory sc8-pr-cvs1:/tmp/cvs-serv10760

Modified Files:
	configure.in 
Log Message:
Update Solaris Sparc options.


Index: configure.in
===================================================================
RCS file: /cvsroot/firebird/firebird2/configure.in,v
retrieving revision 1.105
retrieving revision 1.106
diff -b -U3 -r1.105 -r1.106
--- configure.in	12 Dec 2002 12:08:33 -0000	1.105
+++ configure.in	29 Dec 2002 14:15:50 -0000	1.106
@@ -84,8 +84,8 @@
     MAKEFILE_PREFIX=solaris
     PLATFORM=SOLARIS
     AC_DEFINE(SOLARIS)
-    LOCK_MANAGER_FLG=Y
-    EDITLINE_FLG=N
+    LOCK_MANAGER_FLG=N
+    EDITLINE_FLG=Y
     ;;
 
   i*-sni-sysv4)
@@ -298,7 +298,7 @@
 AC_CHECK_LIB(stdc++, main,,, $LIBS)
 AC_CHECK_LIB(sfio, main,,, $LIBS) dnl Solaris only
 dnl kkuznetsov: Solaris always check for -lnsl
-if test "$PLATFORM" = "solx86" ; then
+if test "$PLATFORM" = "solx86" -o "$PLATFORM" = "SOLARIS"; then
   AC_CHECK_LIB(nsl, gethostname, XE_APPEND(-lnsl,LIBS))
   AC_CHECK_LIB(thread, main)
 fi

Build Version :  T1.5.0.1834 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1817 2002/12/29 13:28:42 nmcc Exp $ )

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

Modified Files:
	why.cpp 
Log Message:
Add Solaris to list not supporting V3 databases via bridge code.


Index: why.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/why.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -U3 -r1.4 -r1.5
--- why.cpp	22 Dec 2002 13:32:04 -0000	1.4
+++ why.cpp	29 Dec 2002 13:28:41 -0000	1.5
@@ -513,7 +513,7 @@
 #endif
 
 #if (defined UNIX) && \
-    !(defined SUPERCLIENT || defined SUPERSERVER || defined linux || defined FREEBSD || defined NETBSD || defined AIX_PPC || defined DARWIN || defined SINIXZ /* platforms without a V3 bridge */)
+    !(defined SUPERCLIENT || defined SUPERSERVER || defined linux || defined FREEBSD || defined NETBSD || defined AIX_PPC || defined DARWIN || defined SINIXZ  || defined SOLARIS /* platforms without a V3 bridge */)
 #ifndef PIPE_SERVER_YVALUE
 #define PIPE_BRIDGE_TO_V3
 #endif

Build Version :  T1.5.0.1833 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1816 2002/12/29 01:45:25 nmcc Exp $ )

Update of /cvsroot/firebird/firebird2/src/burp
In directory sc8-pr-cvs1:/tmp/cvs-serv32585/src/burp

Modified Files:
	restore.epp 
Log Message:
Fix new compiler error in sparc specific code.


Index: restore.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/burp/restore.epp,v
retrieving revision 1.17
retrieving revision 1.18
diff -b -U3 -r1.17 -r1.18
--- restore.epp	16 Dec 2002 21:19:26 -0000	1.17
+++ restore.epp	29 Dec 2002 01:45:24 -0000	1.18
@@ -188,7 +188,7 @@
                                            TRUE - we will
                                            FALSE - we will not */
 #ifdef sparc
-static CONST SSHORT old_sparcs[] =
+CONST SSHORT old_sparcs[] =
     {0, 0, 0, 2, 0, 0, 0, 0, 2, 4, 4, 4, 8, 8, 0, 0, 8, 8, 8};
 #endif 
 
@@ -6478,12 +6478,11 @@
 #ifdef sparc 
 BURP_FLD	field;
 ULONG	offset, length, dtype, alignment;
-SSHORT	*alignments;
 TGBL	    tdgbl;
 
-tdgbl = GET_THREAD_DATA;
+CONST SSHORT	*alignments = old_sparcs;
 
-alignments = old_sparcs;
+tdgbl = GET_THREAD_DATA;
 
 for (field = relation->rel_fields; field; field = field->fld_next)
     {

Build Version :  T1.5.0.1832 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1815 2002/12/29 01:38:21 nmcc Exp $ )

Update of /cvsroot/firebird/firebird2/builds/posix
In directory sc8-pr-cvs1:/tmp/cvs-serv30847/builds/posix

Modified Files:
	Makefile.in.extlib make.rules prefix.darwin prefix.freebsd 
	prefix.linux prefix.mingw prefix.sinixz 
Log Message:
Move platform specific ld option to platform makefiles.


Index: Makefile.in.extlib
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.extlib,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -U3 -r1.5 -r1.6
--- Makefile.in.extlib	5 Dec 2002 16:15:03 -0000	1.5
+++ Makefile.in.extlib	29 Dec 2002 01:38:20 -0000	1.6
@@ -85,7 +85,7 @@
 
 $(UDF)/ib_udf.so:	$(UDF_Objects)
 #	$(LIB_LINK) $(LIB_LINK_SONAME)ib_udf.so $(LIB_LINK_RPATH)/usr/lib -o $@ $^
-	$(LIB_LINK)$(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)ib_udf.so $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^
+	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)ib_udf.so $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^
 #	-$(LN) $(@F) $(LIBFBINTL_SOBASENAME) 
 #	-$(LN) $(notdir $(LIBFBINTL_SOBASENAME)) $(LIBFBINTL_SONAME)
 
@@ -95,7 +95,7 @@
 lib_fb_udf: $(UDF)/fb_udf.so
 
 $(UDF)/fb_udf.so:	$(FBUDF_Objects)
-	$(LIB_LINK)$(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fb_udf.so $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^
+	$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)fb_udf.so $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^
 #	-$(LN) $(@F) $(LIBFBINTL_SOBASENAME) 
 #	-$(LN) $(notdir $(LIBFBINTL_SOBASENAME)) $(LIBFBINTL_SONAME)
 

Index: make.rules
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/posix/make.rules,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -U3 -r1.10 -r1.11
--- make.rules	5 Dec 2002 16:15:04 -0000	1.10
+++ make.rules	29 Dec 2002 01:38:20 -0000	1.11
@@ -137,7 +137,7 @@
     STATICEXE_LINK = libtool @CC@ -all-static
 else
 
-    LIB_LINK= @CC@ -shared 
+    LIB_LINK= @CC@
     STATICLIB_LINK= ar cruvs
 #    LIB_LINK_OPTIONS = -soname libgds.so -rpath /usr/lib
 #    LIB_LINK_OPTIONS = -soname libgds.so.2 -rpath /usr/lib

Index: prefix.darwin
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/posix/prefix.darwin,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -U3 -r1.5 -r1.6
--- prefix.darwin	5 Dec 2002 16:15:04 -0000	1.5
+++ prefix.darwin	29 Dec 2002 01:38:20 -0000	1.6
@@ -20,6 +20,6 @@
 
 PROD_FLAGS=-O3 -DNDEBUG -DDARWIN -pipe -MMD -p -fPIC
 DEV_FLAGS=-ggdb -DDARWIN -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall
-LIB_LINK_OPTIONS:=
+LIB_LINK_OPTIONS:=-shared
 LIB_LINK_RPATH:=-Wl,-rpath,
 LIB_LINK_SONAME:=-Wl,-soname,

Index: prefix.freebsd
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/posix/prefix.freebsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -U3 -r1.3 -r1.4
--- prefix.freebsd	5 Dec 2002 16:15:04 -0000	1.3
+++ prefix.freebsd	29 Dec 2002 01:38:20 -0000	1.4
@@ -20,6 +20,6 @@
 
 PROD_FLAGS=-O -DNDEBUG -DFREEBSD -pipe -MMD -p -fPIC
 DEV_FLAGS=-ggdb -DFREEBSD -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall
-LIB_LINK_OPTIONS:=
+LIB_LINK_OPTIONS:=-shared
 LIB_LINK_RPATH:=-Wl,-rpath,
 LIB_LINK_SONAME:=-Wl,-soname,

Index: prefix.linux
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/posix/prefix.linux,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -U3 -r1.12 -r1.13
--- prefix.linux	16 Dec 2002 21:19:18 -0000	1.12
+++ prefix.linux	29 Dec 2002 01:38:20 -0000	1.13
@@ -24,6 +24,6 @@
 PROD_FLAGS=-O3 -march=i386 -DNDEBUG -DLINUX -pipe -MMD -fPIC
 DEV_FLAGS=-ggdb -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -p -fPIC -Wall -Wno-switch
 
-LIB_LINK_OPTIONS:=
+LIB_LINK_OPTIONS:=-shared
 LIB_LINK_RPATH:=-Wl,-rpath,
 LIB_LINK_SONAME:=-Wl,-soname,

Index: prefix.mingw
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/posix/prefix.mingw,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -U3 -r1.6 -r1.7
--- prefix.mingw	12 Dec 2002 12:08:51 -0000	1.6
+++ prefix.mingw	29 Dec 2002 01:38:20 -0000	1.7
@@ -23,6 +23,6 @@
 
 JRDBOOT_Extra_Files=isc_sync.cpp thd.cpp
 
-LIB_LINK_OPTIONS:=
+LIB_LINK_OPTIONS:=-shared
 LIB_LINK_RPATH:=-Wl,-rpath,
 LIB_LINK_SONAME:=-Wl,-soname,

Index: prefix.sinixz
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/posix/prefix.sinixz,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -U3 -r1.12 -r1.13
--- prefix.sinixz	10 Dec 2002 11:53:43 -0000	1.12
+++ prefix.sinixz	29 Dec 2002 01:38:20 -0000	1.13
@@ -34,7 +34,7 @@
 PROD_FLAGS=$(PROD_WARNINGS) -DNDEBUG $(COMMON_FLAGS) -pipe -fPIC
 DEV_FLAGS=$(DEV_WARNINGS) -ggdb -DDEBUG_GDS_ALLOC $(COMMON_FLAGS) -pipe -fPIC
 
-LIB_LINK_OPTIONS:=
+LIB_LINK_OPTIONS:=-shared
 LIB_LINK_RPATH:=-Wl,-rpath,
 LIB_LINK_SONAME:=-Wl,-soname,

Build Version :  T1.5.0.1831 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1814 2002/12/28 23:02:59 fsg Exp $ )

Update of /cvsroot/firebird/firebird2
In directory sc8-pr-cvs1:/tmp/cvs-serv28431/firebird2

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/firebird2/ChangeLog,v
retrieving revision 1.89
retrieving revision 1.90
diff -b -U3 -r1.89 -r1.90
--- ChangeLog	24 Dec 2002 23:03:06 -0000	1.89
+++ ChangeLog	28 Dec 2002 23:02:57 -0000	1.90
@@ -1,3 +1,10 @@
+2002-12-28 01:20  arnobrinkman
+
+	* firebird2/src/jrd/opt.cpp:
+	
+	bugfix: OUTER JOINs and no current record for fetch operation,
+	caused by previous optimizer change
+
 2002-12-24 19:14  skidder
 
 	* firebird2/src/jrd/met.epp:

Build Version :  T1.5.0.1830 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1813 2002/12/28 00:20:47 arnobrinkman )

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

Modified Files:
	opt.cpp 
Log Message:
bugfix: OUTER JOINs and no current record for fetch operation, caused by previous optimizer change

Index: opt.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/opt.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -b -U3 -r1.38 -r1.39
--- opt.cpp	16 Dec 2002 00:45:35 -0000	1.38
+++ opt.cpp	28 Dec 2002 00:20:45 -0000	1.39
@@ -569,17 +569,17 @@
 	else
 		rse->rse_aggregate = aggregate = NULL;
 
-/* mark the previous used streams (sub-rse's) as active */
-
-	for (i = 1; i <= used_streams[0]; i++) {
-		csb->csb_rpt[used_streams[i]].csb_flags |= csb_active;			
-	}
-
 /* outer joins require some extra processing */
 
 	if (rse->rse_jointype != blr_inner)
 		rsb = gen_outer(tdbb, opt_, rse, rivers_stack, &sort, &project);
 	else {
+
+		/* mark the previous used streams (sub-rse's) as active */
+
+		for (i = 1; i <= used_streams[0]; i++) {
+			csb->csb_rpt[used_streams[i]].csb_flags |= csb_active;			
+		}
 
 		/* attempt to form joins in decreasing order of desirability */

Update of /cvsroot/firebird/Net-Provider
In directory sc8-pr-cvs1:/tmp/cvs-serv9575

Modified Files:
	CHANGELOG.txt 
Log Message:
Updated CHANGELOG.TXT

Index: CHANGELOG.txt
===================================================================
RCS file: /cvsroot/firebird/Net-Provider/CHANGELOG.txt,v
retrieving revision 1.110
retrieving revision 1.111
diff -b -U3 -r1.110 -r1.111
--- CHANGELOG.txt	25 Dec 2002 10:30:52 -0000	1.110
+++ CHANGELOG.txt	27 Dec 2002 08:38:43 -0000	1.111
@@ -1,6 +1,18 @@
 FB.Net - Firebird managed data provider for .Net and Mono
 =========================================================
 
+
+2002-12-27 Carlos Guzmán Álvarez  <carlosga@...>
+
+	* source/FbParameter.cs:
+
+		- Fixed error setting parameter value with an array.
+
+	* source/FbStatement.cs:
+
+		- Minor changes on text blob parameter conversion.
+
+
 2002-12-25 Carlos Guzmán Álvarez  <carlosga@...>
 
 	* source/FbCommand.cs:

Update of /cvsroot/firebird/Net-Provider/source
In directory sc8-pr-cvs1:/tmp/cvs-serv9457

Modified Files:
	FbParameter.cs 
Log Message:
Fixed error setting parameter value with an array.

Index: FbParameter.cs
===================================================================
RCS file: /cvsroot/firebird/Net-Provider/source/FbParameter.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -U3 -r1.12 -r1.13
--- FbParameter.cs	21 Dec 2002 13:16:41 -0000	1.12
+++ FbParameter.cs	27 Dec 2002 08:38:25 -0000	1.13
@@ -116,7 +116,7 @@
 			get{ return paramValue; }
 			set
 			{ 
-				if (fbTypeSet)
+				if (fbTypeSet && !(value is Array))
 				{
 					if (value != null && !Convert.IsDBNull(value))
 					{

Update of /cvsroot/firebird/Net-Provider/source
In directory sc8-pr-cvs1:/tmp/cvs-serv9280

Modified Files:
	FbStatement.cs 
Log Message:
Minor changes on text blob parameter conversion.

Index: FbStatement.cs
===================================================================
RCS file: /cvsroot/firebird/Net-Provider/source/FbStatement.cs,v
retrieving revision 1.22
retrieving revision 1.23
diff -b -U3 -r1.22 -r1.23
--- FbStatement.cs	19 Dec 2002 17:40:07 -0000	1.22
+++ FbStatement.cs	27 Dec 2002 08:38:05 -0000	1.23
@@ -461,7 +461,7 @@
 									{
 										FbClob clob = new FbClob(Connection, Transaction);
 										in_sqlda.sqlvar[i].sqldata = clob.Write(
-											(((FbParameter)paramEnumerator.Current).Value).ToString());
+											Convert.ToString(((FbParameter)paramEnumerator.Current).Value));
 									}
 									else
 									{

Update of /cvsroot/firebird/Net-Provider
In directory sc8-pr-cvs1:/tmp/cvs-serv16321

Modified Files:
	makefile 
Log Message:
Minor Changes on Linux makefile

Index: makefile
===================================================================
RCS file: /cvsroot/firebird/Net-Provider/makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -U3 -r1.3 -r1.4
--- makefile	10 Dec 2002 09:48:27 -0000	1.3
+++ makefile	26 Dec 2002 19:03:39 -0000	1.4
@@ -14,8 +14,8 @@
 	$(MCS) -target:library -out:$(LIBRARY) $(LD_FLAGS) $(DEFINE) $(GDS_RESOURCES) $(TOOL_RESOURCES) $(RECURSE_SOURCE)
 
 install:
-	rm -r build
-	mkdir build
+	rm -rf build
+	mkdir -p build
 	$(COPY) $(LIBRARY) ./build
 
 clean:

Update of /cvsroot/firebird/Net-Provider
In directory sc8-pr-cvs1:/tmp/cvs-serv20103

Modified Files:
	CHANGELOG.txt 
Log Message:
Updated CHANGELOG.TXT

Index: CHANGELOG.txt
===================================================================
RCS file: /cvsroot/firebird/Net-Provider/CHANGELOG.txt,v
retrieving revision 1.109
retrieving revision 1.110
diff -b -U3 -r1.109 -r1.110
--- CHANGELOG.txt	24 Dec 2002 23:13:09 -0000	1.109
+++ CHANGELOG.txt	25 Dec 2002 10:30:52 -0000	1.110
@@ -1,6 +1,13 @@
 FB.Net - Firebird managed data provider for .Net and Mono
 =========================================================
 
+2002-12-25 Carlos Guzmán Álvarez  <carlosga@...>
+
+	* source/FbCommand.cs:
+
+		- Fixed error handling transaction on Connection and Transaction properties.
+
+
 2002-12-24 Carlos Guzmán Álvarez  <carlosga@...>
 
 	* source/FbCommandBuilder.cs:

Update of /cvsroot/firebird/Net-Provider/source
In directory sc8-pr-cvs1:/tmp/cvs-serv19988

Modified Files:
	FbCommand.cs 
Log Message:
Fixed error handling transaction on Connection and Transaction properties.

Index: FbCommand.cs
===================================================================
RCS file: /cvsroot/firebird/Net-Provider/source/FbCommand.cs,v
retrieving revision 1.47
retrieving revision 1.48
diff -b -U3 -r1.47 -r1.48
--- FbCommand.cs	21 Dec 2002 13:16:41 -0000	1.47
+++ FbCommand.cs	25 Dec 2002 10:30:17 -0000	1.48
@@ -73,7 +73,7 @@
 			}
 			set 
 			{ 				
-				if(commandText != value && commandText != String.Empty)
+				if (commandText != value && commandText != String.Empty)
 				{
 					statement.DropStatement();
 				}
@@ -120,9 +120,9 @@
 			get{return connection;}
 			set
 			{
-				if(Transaction != null)
+				if (Transaction != null)
 				{
-					if(Transaction.IscTransaction != null)
+					if (!Transaction.IsUpdated)
 					{
 						throw new InvalidOperationException("The Connection property was changed while a transaction was in progress.");
 					}
@@ -135,12 +135,14 @@
 				 */
 				if (connection != value)
 				{										
-					if(Transaction != null)
+					if (Transaction != null)
 					{
-						if(Transaction.IscTransaction != null)
+						/*
+						if (Transaction.IscTransaction != null)
 						{
 							Transaction.Rollback();							
 						}
+						*/
 						Transaction = null;
 					}
 
@@ -187,9 +189,9 @@
 			get{return transaction;}
 			set
 			{
-				if(transaction != null)
+				if (transaction != null)
 				{
-					if(transaction.IscTransaction == null)
+					if (transaction.IsUpdated)
 					{
 						transaction = value; 
 					}
@@ -330,13 +332,13 @@
 			if (Connection == null || Connection.State != ConnectionState.Open)
 				throw new InvalidOperationException("Connection must valid and open");
 
-			if(Connection.DataReader != null)
+			if (Connection.DataReader != null)
 				throw new InvalidOperationException("There is already an open DataReader associated with this Connection which must be closed first.");
 
-			if(Transaction == null)
+			if (Transaction == null)
 				throw new InvalidOperationException("Command must have a valid Transaction.");
 
-			if(!Connection.Equals(Transaction.Connection))
+			if (!Connection.Equals(Transaction.Connection))			
 				throw new InvalidOperationException("Command Connection is not equal to Transaction Connection");
 
 			try
@@ -348,7 +350,7 @@
 			}
 			catch(GDSException ex)
 			{
-				if(Connection.AutoCommit)
+				if (Connection.AutoCommit)
 					Transaction.Rollback();
 
 				throw new FbException(ex);
@@ -381,13 +383,13 @@
 			if (Connection == null || Connection.State != ConnectionState.Open)
 				throw new InvalidOperationException("Connection must valid and open");
 
-			if(Connection.DataReader != null)
+			if (Connection.DataReader != null)
 				throw new InvalidOperationException("There is already an open DataReader associated with this Connection which must be closed first.");
 
-			if(Transaction == null)
+			if (Transaction == null)
 				throw new InvalidOperationException("Command must have a valid Transaction.");
 
-			if(!Connection.Equals(Transaction.Connection))
+			if (!Connection.Equals(Transaction.Connection))
 				throw new InvalidOperationException("Command Connection is not equal to Transaction Connection");
 
 			try
@@ -408,7 +410,7 @@
 			}
 			catch(GDSException ex)
 			{
-				if(Connection.AutoCommit)
+				if (Connection.AutoCommit)
 					Transaction.Rollback();
 
 				throw new FbException(ex);
@@ -425,13 +427,13 @@
 			if (Connection == null || Connection.State != ConnectionState.Open)
 				throw new InvalidOperationException("Connection must valid and open");
 
-			if(Connection.DataReader != null)
+			if (Connection.DataReader != null)
 				throw new InvalidOperationException("There is already an open DataReader associated with this Connection which must be closed first.");
 
-			if(Transaction == null)
+			if (Transaction == null)
 				throw new InvalidOperationException("Command must have a valid Transaction.");
 
-			if(!Connection.Equals(Transaction.Connection))
+			if (!Connection.Equals(Transaction.Connection))
 				throw new InvalidOperationException("Command Connection is not equal to Transaction Connection");
 
 			try
@@ -442,12 +444,12 @@
 				recordsAffected = statement.GetRecordsAffected();
 
 				// Gets only the first row
-				if(statement.Resultset.Fetch())
+				if (statement.Resultset.Fetch())
 				{
 					val = statement.Resultset.GetValue(0);
 				}
 
-				if(Connection.AutoCommit)
+				if (Connection.AutoCommit)
 					Transaction.Commit();
 			}
 			catch(GDSException ex)
@@ -464,15 +466,15 @@
 			if (Connection == null || Connection.State != ConnectionState.Open)
 				throw new InvalidOperationException("Connection must valid and open.");
 
-			if(Transaction == null)
+			if (Transaction == null)
 				throw new InvalidOperationException("Command must have a valid Transaction.");
 
-			if(!Connection.Equals(Transaction.Connection))
+			if (!Connection.Equals(Transaction.Connection))
 				throw new InvalidOperationException("Command Connection is not equal to Transaction Connection.");
 
-			if(Statement != null)
+			if (Statement != null)
 			{
-				if(Statement.State == CommandState.Executed || Statement.State == CommandState.Prepared)
+				if (Statement.State == CommandState.Executed || Statement.State == CommandState.Prepared)
 				{
 					// If the statment is already executed or prepared
 					// don´t make anything
@@ -498,7 +500,7 @@
 
 			actualCommand++;
 
-			if(actualCommand >= commands.Length)
+			if (actualCommand >= commands.Length)
 			{
 				actualCommand--;
 			}

Update of /cvsroot/firebird/Net-Provider
In directory sc8-pr-cvs1:/tmp/cvs-serv5318

Modified Files:
	CHANGELOG.txt 
Log Message:
Updated CHANGELOG.TXT

Index: CHANGELOG.txt
===================================================================
RCS file: /cvsroot/firebird/Net-Provider/CHANGELOG.txt,v
retrieving revision 1.108
retrieving revision 1.109
diff -b -U3 -r1.108 -r1.109
--- CHANGELOG.txt	24 Dec 2002 16:33:41 -0000	1.108
+++ CHANGELOG.txt	24 Dec 2002 23:13:09 -0000	1.109
@@ -9,6 +9,8 @@
 		
 		- Fixed error assigning parameter values for delete commands.
 
+		- Changes on IncludeInInsert and IncludeInUpdate methods for check 		DataColumns properties.
+
 
 2002-12-23 Carlos Guzmán Álvarez  <carlosga@...>

Update of /cvsroot/firebird/Net-Provider/source
In directory sc8-pr-cvs1:/tmp/cvs-serv5137

Modified Files:
	FbCommandBuilder.cs 
Log Message:
Changes on IncludeInInsert and IncludeInUpdate methods for check DataColumns properties

Index: FbCommandBuilder.cs
===================================================================
RCS file: /cvsroot/firebird/Net-Provider/source/FbCommandBuilder.cs,v
retrieving revision 1.39
retrieving revision 1.40
diff -b -U3 -r1.39 -r1.40
--- FbCommandBuilder.cs	24 Dec 2002 16:33:00 -0000	1.39
+++ FbCommandBuilder.cs	24 Dec 2002 23:12:37 -0000	1.40
@@ -298,7 +298,7 @@
 			int i = 0;
 			foreach (DataRow schemaRow in schemaTable.Rows)
 			{				
-				if(IncludedInInsert(schemaRow))
+				if(IncludedInInsert(schemaRow, row))
 				{
 					if(fields.Length > 0)
 					{
@@ -367,9 +367,9 @@
 			int i = 0;
 			foreach (DataRow schemaRow in schemaTable.Rows)
 			{				
-				if(IncludedInUpdate(schemaRow))
+				if (IncludedInUpdate(schemaRow, row))
 				{
-					if(sets.Length > 0)
+					if (sets.Length > 0)
 					{
 						sets.Append(", ");
 					}
@@ -379,9 +379,9 @@
 
 					FbParameter parameter = CreateParameter(schemaRow, i, false);
 										
-					if(tableMapping != null)
+					if (tableMapping != null)
 					{
-						if(tableMapping.ColumnMappings.Count > 0)
+						if (tableMapping.ColumnMappings.Count > 0)
 						{
 							dsColumnName = tableMapping.ColumnMappings[parameter.SourceColumn].DataSetColumn;
 						}
@@ -559,11 +559,30 @@
 
 
 		/// <include file='xmldoc/fbcommandbuilder.xml' path='doc/member[@name="M:IncludedInInsert(System.Data.DataRow)"]/*'/>
-		private bool IncludedInInsert(DataRow schemaRow)
+		private bool IncludedInInsert(DataRow schemaRow, DataRow row)
 		{
 			// If the parameter has one of these properties, then we don't include it in the insert:
 			// AutoIncrement, RowVersion, ReadOnly
 
+			if (row != null)
+			{
+				string		columnName	= (string) schemaRow["ColumnName"];
+				DataColumn	column		= row.Table.Columns[columnName];
+
+				if (column.AutoIncrement)
+				{
+					return false;
+				}
+				if (column.ReadOnly)
+				{
+					return false;
+				}
+				if (column.Expression != String.Empty)
+				{
+					return false;
+				}
+			}
+
 			if ((bool) schemaRow["IsAutoIncrement"])
 			{
 				return false;
@@ -585,10 +604,29 @@
 		}
 
 		/// <include file='xmldoc/fbcommandbuilder.xml' path='doc/member[@name="M:IncludedInUpdate(System.Data.DataRow)"]/*'/>
-		private bool IncludedInUpdate(DataRow schemaRow)
+		private bool IncludedInUpdate(DataRow schemaRow, DataRow row)
 		{
 			// If the parameter has one of these properties, then we don't include it in the insert:
 			// AutoIncrement, RowVersion, ReadOnly
+
+			if (row != null)
+			{
+				string		columnName	= (string) schemaRow["ColumnName"];
+				DataColumn	column		= row.Table.Columns[columnName];
+
+				if (column.AutoIncrement)
+				{
+					return false;
+				}
+				if (column.ReadOnly)
+				{
+					return false;
+				}
+				if (column.Expression != String.Empty)
+				{
+					return false;
+				}
+			}
 
 			if ((bool) schemaRow["IsAutoIncrement"])
 			{

Build Version :  T1.5.0.1829 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1812 2002/12/24 23:03:07 fsg Exp $ )

Update of /cvsroot/firebird/firebird2
In directory sc8-pr-cvs1:/tmp/cvs-serv3126/firebird2

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog


Index: ChangeLog
===================================================================
RCS file: /cvsroot/firebird/firebird2/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -b -U3 -r1.88 -r1.89
--- ChangeLog	23 Dec 2002 23:04:51 -0000	1.88
+++ ChangeLog	24 Dec 2002 23:03:06 -0000	1.89
@@ -1,3 +1,9 @@
+2002-12-24 19:14  skidder
+
+	* firebird2/src/jrd/met.epp:
+	
+	Fix for crash during procedure alteration
+
 2002-12-23 18:10  dimitr
 
 	* firebird2/src/jrd/dfw.epp:

Build Version :  T1.5.0.1828 Firebird 1.5 Alpha 5

(writeBuildNum.sh,v 1.1811 2002/12/24 18:14:50 skidder Exp  )

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

Modified Files:
	met.epp 
Log Message:
Fix for crash during procedure alteration

Index: met.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/jrd/met.epp,v
retrieving revision 1.43
retrieving revision 1.44
diff -b -U3 -r1.43 -r1.44
--- met.epp	22 Dec 2002 13:08:50 -0000	1.43
+++ met.epp	24 Dec 2002 18:14:49 -0000	1.44
@@ -281,7 +281,8 @@
 		for (ptr = procedures->begin(), end = procedures->end();
 			ptr < end; ptr++) 
 		{
-			if ( (procedure = JRD_PRC(*ptr)) && !(procedure->prc_flags & PRC_obsolete)) 
+			if ( (procedure = JRD_PRC(*ptr)) && procedure->prc_request &&
+				 !(procedure->prc_flags & PRC_obsolete) ) 
 			{
 				for (RSC resource = procedure->prc_request->req_resources; resource;
 					 resource = resource->rsc_next)
@@ -296,7 +297,8 @@
 		for (ptr = procedures->begin(), end = procedures->end();
 			ptr < end; ptr++) 
 		{
-			if ( (procedure = JRD_PRC(*ptr)) && !(procedure->prc_flags & PRC_obsolete) && 
+			if ( (procedure = JRD_PRC(*ptr)) && procedure->prc_request &&
+				 !(procedure->prc_flags & PRC_obsolete) && 
 				procedure->prc_use_count != procedure->prc_int_use_count && procedure != proc )
 			{
 				adjust_dependencies(procedure);
@@ -305,6 +307,7 @@
 		
 		if (proc) {
 		  result = proc->prc_use_count == proc->prc_int_use_count;
+			if (proc->prc_request)
 		  adjust_dependencies(proc);		  
 		}
 		
@@ -312,7 +315,7 @@
 		for (ptr = procedures->begin(), end = procedures->end();
 				ptr < end; ptr++) 
 		{
-			if ( (procedure = JRD_PRC(*ptr)) && 
+			if ( (procedure = JRD_PRC(*ptr)) && procedure->prc_request &&
 				!(procedure->prc_flags & PRC_obsolete) && (procedure != proc) )
 			{

Update of /cvsroot/firebird/Net-Provider
In directory sc8-pr-cvs1:/tmp/cvs-serv30430

Modified Files:
	CHANGELOG.txt 
Log Message:
Updated CHANGELOG.TXT

Index: CHANGELOG.txt
===================================================================
RCS file: /cvsroot/firebird/Net-Provider/CHANGELOG.txt,v
retrieving revision 1.107
retrieving revision 1.108
diff -b -U3 -r1.107 -r1.108
--- CHANGELOG.txt	23 Dec 2002 13:57:51 -0000	1.107
+++ CHANGELOG.txt	24 Dec 2002 16:33:41 -0000	1.108
@@ -1,6 +1,15 @@
 FB.Net - Firebird managed data provider for .Net and Mono
 =========================================================
 
+2002-12-24 Carlos Guzmán Álvarez  <carlosga@...>
+
+	* source/FbCommandBuilder.cs:
+	
+		- Added CreateParameter method.
+		
+		- Fixed error assigning parameter values for delete commands.
+
+
 2002-12-23 Carlos Guzmán Álvarez  <carlosga@...>
 
 	* source/FbParameterCollection.cs:

Update of /cvsroot/firebird/Net-Provider
In directory sc8-pr-cvs1:/tmp/cvs-serv30312

Modified Files:
	CHANGES.TXT 
Log Message:
Updated CHANGES.TXT

Index: CHANGES.TXT
===================================================================
RCS file: /cvsroot/firebird/Net-Provider/CHANGES.TXT,v
retrieving revision 1.15
retrieving revision 1.16
diff -b -U3 -r1.15 -r1.16
--- CHANGES.TXT	18 Dec 2002 21:38:53 -0000	1.15
+++ CHANGES.TXT	24 Dec 2002 16:33:24 -0000	1.16
@@ -5,9 +5,13 @@
 Beta 1 ( XXXX-XX-XX )
 ------ --------------
 
+- some BugFixes.
+
 - Improved API reference documentation.
 
 - Better fit to ADO .NET documentation.
+
+- New instalation system for Windows, using Ghost Installer Free edition ( Thanks to Enrico Speranza for his feedbak )
 
 
 Alpha 4 ( 2002-12-09 )