Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2011-05-31 03:30:09
|
Revision: 53045
http://firebird.svn.sourceforge.net/firebird/?rev=53045&view=rev
Author: firebirds
Date: 2011-05-31 03:29:57 +0000 (Tue, 31 May 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-05-31 03:17:42 UTC (rev 53044)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-05-31 03:29:57 UTC (rev 53045)
@@ -1,3 +1,22 @@
+ 2011-05-31 00:54 asfernandes
+ M src/jrd/cmp.cpp
+Fixed CORE-3489 - Blob transliteration may not happen inside the union.
+
+ 2011-05-30 15:50 alexpeshkoff
+ M builds/install/arch-specific/linux/misc/tarMainInstall.sh.in
+ M builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in
+ M builds/install/misc/posixLibrary.sh.in
+Fixed CORE-3467: provide a silent install switch
+
+ 2011-05-30 12:39 alexpeshkoff
+ M src/utilities/fbsvcmgr.cpp
+ M src/utilities/fbtracemgr/traceMgrMain.cpp
+Fixed CORE-3487: sometimes fbtracemgr segfaults when ending with ctrl+c
+
+ 2011-05-30 09:55 dimitr
+ M src/remote/inet.cpp
+Fixed CORE-3387: Client library could hang infinitely waiting for a reply packet on a forcibly disconnected server socket.
+
2011-05-27 09:00 mapopa
M src/common/classes/alloc.cpp
Unused inline function
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-05-31 03:17:42 UTC (rev 53044)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-05-31 03:29:57 UTC (rev 53045)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26292
+ FORMAL BUILD NUMBER:26296
*/
-#define PRODUCT_VER_STRING "2.5.1.26292"
-#define FILE_VER_STRING "WI-V2.5.1.26292"
-#define LICENSE_VER_STRING "WI-V2.5.1.26292"
-#define FILE_VER_NUMBER 2, 5, 1, 26292
+#define PRODUCT_VER_STRING "2.5.1.26296"
+#define FILE_VER_STRING "WI-V2.5.1.26296"
+#define LICENSE_VER_STRING "WI-V2.5.1.26296"
+#define FILE_VER_NUMBER 2, 5, 1, 26296
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26292"
+#define FB_BUILD_NO "26296"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-05-31 03:17:42 UTC (rev 53044)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-05-31 03:29:57 UTC (rev 53045)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26292
+BuildNum=26296
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-06-02 03:25:08
|
Revision: 53087
http://firebird.svn.sourceforge.net/firebird/?rev=53087&view=rev
Author: firebirds
Date: 2011-06-02 03:25:02 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-06-02 03:17:22 UTC (rev 53086)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-06-02 03:25:02 UTC (rev 53087)
@@ -1,3 +1,16 @@
+ 2011-06-01 12:17 alexpeshkoff
+ M src/utilities/nbackup.cpp
+Backported CORE-3199: nackup fails due to O_NOATIME flag in database open
+
+ 2011-06-01 10:39 alexpeshkoff
+ M src/include/consts_pub.h
+ M src/utilities/fbsvcmgr.cpp
+Backported CORE-3462: Add metadata only restore to Services API
+
+ 2011-06-01 08:55 alexpeshkoff
+ M src/burp/restore.epp
+Backported CORE-3461: DDL operations fail after backup/restore
+
2011-05-31 00:54 asfernandes
M src/jrd/cmp.cpp
Fixed CORE-3489 - Blob transliteration may not happen inside the union.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-02 03:17:22 UTC (rev 53086)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-02 03:25:02 UTC (rev 53087)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26296
+ FORMAL BUILD NUMBER:26299
*/
-#define PRODUCT_VER_STRING "2.5.1.26296"
-#define FILE_VER_STRING "WI-V2.5.1.26296"
-#define LICENSE_VER_STRING "WI-V2.5.1.26296"
-#define FILE_VER_NUMBER 2, 5, 1, 26296
+#define PRODUCT_VER_STRING "2.5.1.26299"
+#define FILE_VER_STRING "WI-V2.5.1.26299"
+#define LICENSE_VER_STRING "WI-V2.5.1.26299"
+#define FILE_VER_NUMBER 2, 5, 1, 26299
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26296"
+#define FB_BUILD_NO "26299"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-02 03:17:22 UTC (rev 53086)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-02 03:25:02 UTC (rev 53087)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26296
+BuildNum=26299
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-06-03 03:24:44
|
Revision: 53096
http://firebird.svn.sourceforge.net/firebird/?rev=53096&view=rev
Author: firebirds
Date: 2011-06-03 03:24:35 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-06-03 03:17:55 UTC (rev 53095)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-06-03 03:24:35 UTC (rev 53096)
@@ -1,3 +1,16 @@
+ 2011-06-02 13:48 dimitr
+ M src/jrd/DatabaseSnapshot.cpp
+Fixed CORE-3508: MON$DATABASE_NAME and MON$ATTACHMENT_NAME fields contain question marks instead of non-ASCII characters regardless of the connection charset.
+
+ 2011-06-02 08:42 alexpeshkoff
+ M src/dsql/sqlda.h
+ M src/jrd/why.cpp
+Fixed CORE-3151: memory allocated in sqlda_sup may be not released in some cases
+
+ 2011-06-02 07:45 alexpeshkoff
+ M src/burp/burpMain.cpp
+Fixed CORE-3150: segmentation fault in gbak when interrupted with Ctrl-C
+
2011-06-01 12:17 alexpeshkoff
M src/utilities/nbackup.cpp
Backported CORE-3199: nackup fails due to O_NOATIME flag in database open
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-03 03:17:55 UTC (rev 53095)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-03 03:24:35 UTC (rev 53096)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26299
+ FORMAL BUILD NUMBER:26302
*/
-#define PRODUCT_VER_STRING "2.5.1.26299"
-#define FILE_VER_STRING "WI-V2.5.1.26299"
-#define LICENSE_VER_STRING "WI-V2.5.1.26299"
-#define FILE_VER_NUMBER 2, 5, 1, 26299
+#define PRODUCT_VER_STRING "2.5.1.26302"
+#define FILE_VER_STRING "WI-V2.5.1.26302"
+#define LICENSE_VER_STRING "WI-V2.5.1.26302"
+#define FILE_VER_NUMBER 2, 5, 1, 26302
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26299"
+#define FB_BUILD_NO "26302"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-03 03:17:55 UTC (rev 53095)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-03 03:24:35 UTC (rev 53096)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26299
+BuildNum=26302
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2011-06-03 09:52:35
|
Revision: 53098
http://firebird.svn.sourceforge.net/firebird/?rev=53098&view=rev
Author: alexpeshkoff
Date: 2011-06-03 09:52:28 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Fixed CORE-2921: 'make install' does not work on freebsd
Modified Paths:
--------------
firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/freebsdLibrary.sh.in
firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/install.sh.in
firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
firebird/branches/B2_5_Release/builds/install/misc/changeMultiConnectMode.sh.in
firebird/branches/B2_5_Release/builds/install/misc/posixLibrary.sh.in
firebird/branches/B2_5_Release/configure.in
Added Paths:
-----------
firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/firebird_daemon_startup_script.in
Added: firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/firebird_daemon_startup_script.in
===================================================================
--- firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/firebird_daemon_startup_script.in (rev 0)
+++ firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/firebird_daemon_startup_script.in 2011-06-03 09:52:28 UTC (rev 53098)
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/databases/firebird25-server/files/firebird.in,v 1.1 2010/12/20 08:48:54 acm Exp $
+#
+# PROVIDE: firebird
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+
+. /etc/rc.subr
+
+FIREBIRD=@FB_CONFDIR@
+export FIREBIRD
+
+name=firebird
+rcvar=`set_rcvar`
+
+firebird_enable=YES # don't change - if script is installed, it's supposed to start
+firebird_pidfile="/var/run/${name}.pid"
+firebird_user=firebird
+
+command_args="-daemon -forever"
+command=@FB_SBINDIR@/fbguard
+pidfile=${firebird_pidfile}
+
+start_precmd="start_precmd"
+start_postcmd="start_postcmd"
+stop_postcmd=stop_postcmd
+reload_postcmd=reload_postcmd
+
+start_precmd()
+{
+ touch ${firebird_pidfile}
+ chown "${firebird_user}:wheel" ${firebird_pidfile} ||
+ err 1 "Cannot chown ${firebird_pidfile}"
+}
+
+start_postcmd()
+{
+ sleep 1 # Give fbguard time to exec after fork
+ # This avoids getting 2 pids in firebird_pidfile
+ pgrep -u ${firebird_user} fbguard > ${firebird_pidfile}
+}
+
+stop_postcmd()
+{
+ rm -f ${pidfile}
+}
+
+reload_postcmd()
+{
+ rm -f ${pidfile}
+ run_rc_command start
+}
+
+run_rc_command "$1"
Property changes on: firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/firebird_daemon_startup_script.in
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/freebsdLibrary.sh.in
===================================================================
--- firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/freebsdLibrary.sh.in 2011-06-03 08:25:04 UTC (rev 53097)
+++ firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/freebsdLibrary.sh.in 2011-06-03 09:52:28 UTC (rev 53098)
@@ -32,7 +32,7 @@
#------------------------------------------------------------------------
# Get correct options & misc.
-psOptions=aww
+psOptions=-ajx
export psOptions
mktOptions=-q
export mktOptions
@@ -90,16 +90,7 @@
# print location of init script
getInitScriptLocation() {
- if [ -f /etc/rc.d/init.d/*firebird* ]
- then
- echo -n /etc/rc.d/init.d/*firebird*
- elif [ -f /etc/rc.d/*firebird* ]
- then
- echo -n /etc/rc.d/*firebird*
- elif [ -f /etc/init.d/*firebird* ]
- then
- echo -n /etc/init.d/*firebird*
- fi
+ echo -n /etc/rc.d/firebird
}
@@ -107,7 +98,7 @@
# stop super server if it is running
stopSuperServerIfRunning() {
- checkString=`ps -af | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
+ checkString=`ps $psOptions | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
@@ -120,7 +111,7 @@
do
$init_d stop
sleep 1
- checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
+ checkString=`ps $psOptions | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
if [ -z "$checkString" ]
then
return
@@ -192,8 +183,9 @@
return 0
fi
-# dummy for a while
- return 1
+ initScript=`getInitScriptLocation`
+ cp @FB_MISCDIR@/firebird_daemon_startup_script $initScript
+ chmod a=rx $initScript
}
@@ -210,17 +202,6 @@
if [ -f "$InitFile" ]
then
"$InitFile" start
-
- checkString=`ps -af | egrep "\b(fbserver|fb_smp_server)\b" |grep -v grep`
- if [ -z "$checkString" ]
- then
- # server didn't start - possible reason bad shell /bin/false for user "firebird"
- echo
- echo Fixing firebird\'s shell to /bin/sh
- echo
- pw usermod firebird -s /bin/sh
- "$InitFile" start
- fi
fi
}
@@ -228,6 +209,8 @@
# If we have right systems remove the service autostart stuff.
removeServiceAutostart() {
- # dummy for a while
- return 1
+ InitFile=`getInitScriptLocation`
+ if [ -f "$InitFile" ]; then
+ rm -f "$InitFile"
+ fi
}
Modified: firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/install.sh.in
===================================================================
--- firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/install.sh.in 2011-06-03 08:25:04 UTC (rev 53097)
+++ firebird/branches/B2_5_Release/builds/install/arch-specific/freebsd/install.sh.in 2011-06-03 09:52:28 UTC (rev 53098)
@@ -55,7 +55,7 @@
libTarget=$libTdir/$libScript
rm -f $libTarget
- touch $libTarget
+ echo '#!/bin/sh' >$libTarget
for i in posixLibrary.sh @FIR...@Li... freebsdLibrary.sh
do
echo "# $i" >>$libTarget
@@ -167,19 +167,21 @@
cp -f $BuiltFBDir/bin/fbguard ${TargetDir}@FB_SBINDIR@
copyIfExists $BuiltFBDir/bin/fb_lock_print ${TargetDir}@FB_SBINDIR@
copyIfExists $BuiltFBDir/bin/fbmgr.bin ${TargetDir}@FB_SBINDIR@
+# cp $BuiltFBDir/bin/fb_config ${TargetDir}@FB_SBINDIR@
- addLibs $BuildRootDir/gen/firebird/bin changeRunUser.sh ${TargetDir}@FB_SBINDIR@
- addLibs $BuildRootDir/gen/firebird/bin restoreRootRunUser.sh ${TargetDir}@FB_SBINDIR@
- addLibs $BuildRootDir/gen/firebird/bin changeDBAPassword.sh ${TargetDir}@FB_SBINDIR@
- addLibs $BuildRootDir/gen/firebird/bin changeMultiConnectMode.sh ${TargetDir}@FB_SBINDIR@
- addLibs $BuiltFBDir/bin changeGdsLibraryCompatibleLink.sh ${TargetDir}@FB_SBINDIR@
- cp $BuiltFBDir/bin/createAliasDB.sh ${TargetDir}@FB_SBINDIR@
- cp $BuiltFBDir/bin/fb_config ${TargetDir}@FB_SBINDIR@
-
chown root:wheel ${TargetDir}@FB_SBINDIR@/*
chmod 0755 ${TargetDir}@FB_SBINDIR@/*
- chmod 0700 ${TargetDir}@FB_SBINDIR@/*.sh
+# addLibs $BuildRootDir/gen/firebird/bin changeRunUser.sh ${TargetDir}@FB_SBINDIR@
+# addLibs $BuildRootDir/gen/firebird/bin restoreRootRunUser.sh ${TargetDir}@FB_SBINDIR@
+# addLibs $BuildRootDir/gen/firebird/bin changeDBAPassword.sh ${TargetDir}@FB_SBINDIR@
+# addLibs $BuiltFBDir/bin changeGdsLibraryCompatibleLink.sh ${TargetDir}@FB_SBINDIR@
+# cp $BuiltFBDir/bin/createAliasDB.sh ${TargetDir}@FB_SBINDIR@
+ if [ "@FIREBIRD_ARCH_TYPE@" = "classic" ]; then
+ addLibs $BuildRootDir/gen/firebird/bin changeMultiConnectMode.sh ${TargetDir}@FB_SBINDIR@
+ chmod 0700 ${TargetDir}@FB_SBINDIR@/*.sh
+ fi
+
#install scripts
addLibs $BuildRootDir/gen/firebird/bin tarMainInstall.sh $BuildRootDir/gen/install/scripts
addLibs $BuildRootDir/gen/firebird/bin tarinstall.sh $BuildRootDir/gen/install/scripts
@@ -296,13 +298,15 @@
cp $BuildRootDir/src/misc/upgrade/v2/security_database* ${TargetDir}@FB_MISCDIR@/upgrade/security
cp $BuildRootDir/src/misc/upgrade/v2.1/metadata_charset* ${TargetDir}@FB_MISCDIR@/upgrade/metadata
+ cp $BuildRootDir/gen/install/misc/firebird_daemon_startup_script ${TargetDir}@FB_MISCDIR@
+
chown -R root:wheel ${TargetDir}@FB_MISCDIR@
chmod -R go-rwx ${TargetDir}@FB_MISCDIR@
#conf
- cp $BuildRootDir/gen/install/misc/firebird.conf ${TargetDir}@FB_CONFDIR@
- cp $BuildRootDir/gen/install/misc/aliases.conf ${TargetDir}@FB_CONFDIR@
- cp $BuildRootDir/gen/install/misc/fbtrace.conf ${TargetDir}@FB_CONFDIR@
+ cp $BuildRootDir/gen/install/misc/firebird.conf ${TargetDir}@FB_CONFDIR@
+ cp $BuildRootDir/gen/install/misc/aliases.conf ${TargetDir}@FB_CONFDIR@
+ cp $BuildRootDir/gen/install/misc/fbtrace.conf ${TargetDir}@FB_CONFDIR@
chown root:wheel ${TargetDir}@FB_CONFDIR@/*.conf
chmod 0644 ${TargetDir}@FB_CONFDIR@/*.conf
@@ -423,30 +427,56 @@
fixFilePermissions
-# remove any existing gds service
+# remove any existing gds services
cp /etc/services /etc/services.old
cp /etc/inetd.conf /etc/inetd.conf.old
cat /etc/services |grep -v @FB_SERVICE_NAME@ >/etc/services.new
cat /etc/inetd.conf |grep -v @FB_SERVICE_NAME@ >/etc/inetd.conf.new
mv /etc/services.new /etc/services
mv /etc/inetd.conf.new /etc/inetd.conf
+rm -f /etc/rc.d/*firebird*
-# add the gds service and restart inetd
-cat >>/etc/services <<EOF
+# shared lib and lock dir startup script
+if [ -d /etc/rc.d ]; then
+ cat > /etc/rc.d/000.firebird.sh <<EOC
+#!/bin/sh
+[ -d @FB_LIBDIR@ ] && /sbin/ldconfig -m @FB_LIBDIR@
+[ -d /tmp/firebird ] || (rm -f /tmp/firebird; mkdir /tmp/firebird)
+chown -R firebird:firebird /tmp/firebird
+chmod -R 0660 /tmp/firebird
+chmod 0770 /tmp/firebird
+EOC
+ chmod a=rx /etc/rc.d/000.firebird.sh
+ . /etc/rc.d/000.firebird.sh
+fi
+
+# add the gds service
+if [ "@FIREBIRD_ARCH_TYPE@" = "classic" ]; then
+ cat >>/etc/services <<EOF
@FB_SERVICE_NAME@ @FB_SERVICE_PORT@/tcp #Firebird Database Remote Protocol
EOF
-cat >>/etc/inetd.conf <<EOF
+
+ cat >>/etc/inetd.conf <<EOF
@FB_SERVICE_NAME@ stream tcp nowait firebird ${TargetDir}@FB_SBINDIR@/fb_inet_server fb_inet_server
EOF
+
+fi
+
+# reset make env
+FIREBIRD_LOCK=
+export FIREBIRD_LOCK
+
+# restart inetd
if [ -f /var/run/inetd.pid ]; then
- kill -HUP `cat /var/run/inetd.pid`
+ kill -HUP `cat /var/run/inetd.pid`
+ sleep 1 # Give it time to reload
fi
-# shared lib startup script
-if [ -d /etc/rc.d ]; then
- (
- echo "#!/bin/sh"; echo "[ -d @FB_LIBDIR@ ] && /sbin/ldconfig -m @FB_LIBDIR@"
- ) > /etc/rc.d/000.firebird.sh
- chmod a=rx /etc/rc.d/000.firebird.sh
+# add firebird startup script
+if [ "@FIREBIRD_ARCH_TYPE@" = "super" ]; then
+ initScript=/etc/rc.d/firebird
+ rm -f $initScript
+ cp @FB_MISCDIR@/firebird_daemon_startup_script $initScript
+ chmod a=rx $initScript
+ $initScript start
fi
-
Modified: firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
===================================================================
--- firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in 2011-06-03 08:25:04 UTC (rev 53097)
+++ firebird/branches/B2_5_Release/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in 2011-06-03 09:52:28 UTC (rev 53098)
@@ -32,7 +32,7 @@
#------------------------------------------------------------------------
# Get correct options & misc.
-psOptions=aww
+psOptions=-efaww
export psOptions
mktOptions=-q
export mktOptions
Modified: firebird/branches/B2_5_Release/builds/install/misc/changeMultiConnectMode.sh.in
===================================================================
--- firebird/branches/B2_5_Release/builds/install/misc/changeMultiConnectMode.sh.in 2011-06-03 08:25:04 UTC (rev 53097)
+++ firebird/branches/B2_5_Release/builds/install/misc/changeMultiConnectMode.sh.in 2011-06-03 09:52:28 UTC (rev 53098)
@@ -52,7 +52,7 @@
removeServiceAutostart
echo "Starting firebird in multi$multiAnswer mode..."
-if [ $multiAnswer == process ]; then
+if [ $multiAnswer = process ]; then
updateInetdServiceEntry
resetInetdServer
else
Modified: firebird/branches/B2_5_Release/builds/install/misc/posixLibrary.sh.in
===================================================================
--- firebird/branches/B2_5_Release/builds/install/misc/posixLibrary.sh.in 2011-06-03 08:25:04 UTC (rev 53097)
+++ firebird/branches/B2_5_Release/builds/install/misc/posixLibrary.sh.in 2011-06-03 09:52:28 UTC (rev 53098)
@@ -148,7 +148,7 @@
# Works for both inetd and xinetd
resetInetdServer() {
- pid=`ps -eaf$psOptions | grep inetd | grep -v grep | awk '{print $2}'`
+ pid=`ps $psOptions | grep inetd | grep -v grep | awk '{print $2}'`
if [ "$pid" ]
then
kill -HUP $pid
@@ -202,7 +202,7 @@
checkIfServerRunning() {
- checkString=`ps -ef$psOptions | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
+ checkString=`ps $psOptions | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
serverMode=super
@@ -217,7 +217,7 @@
# Check is server is being actively used.
- checkString=`ps -ef$psOptions | egrep "\b(fb_smp_server)\b" |grep -v grep`
+ checkString=`ps $psOptions | egrep "\b(fb_smp_server)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird SuperClassic server seems to be running."
@@ -225,7 +225,7 @@
exit 1
fi
- checkString=`ps -ef$psOptions | egrep "\b(fbserver|fbguard)\b" |grep -v grep`
+ checkString=`ps $psOptions | egrep "\b(fbserver|fbguard)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird Super server seems to be running."
@@ -233,7 +233,7 @@
exit 1
fi
- checkString=`ps -ef$psOptions | egrep "\b(fb_inet_server|fb_smp_server|gds_pipe)\b" |grep -v grep`
+ checkString=`ps $psOptions | egrep "\b(fb_inet_server|fb_smp_server|gds_pipe)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird Classic server seems to be running."
@@ -244,7 +244,7 @@
# The following check for running interbase or firebird 1.0 servers.
- checkString=`ps -ef$psOptions | egrep "\b(ibserver|ibguard)\b" |grep -v grep`
+ checkString=`ps $psOptions | egrep "\b(ibserver|ibguard)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird/InterBase Super server seems to be running."
@@ -253,7 +253,7 @@
exit 1
fi
- checkString=`ps -ef$psOptions | egrep "\b(gds_inet_server|gds_pipe)\b" |grep -v grep`
+ checkString=`ps $psOptions | egrep "\b(gds_inet_server|gds_pipe)\b" |grep -v grep`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird/InterBase Classic server seems to be running."
Modified: firebird/branches/B2_5_Release/configure.in
===================================================================
--- firebird/branches/B2_5_Release/configure.in 2011-06-03 08:25:04 UTC (rev 53097)
+++ firebird/branches/B2_5_Release/configure.in 2011-06-03 09:52:28 UTC (rev 53098)
@@ -1330,6 +1330,7 @@
;;
FREEBSD)
AC_CONFIG_FILES([gen/install/install.sh:builds/install/arch-specific/freebsd/install.sh.in
+ gen/install/misc/firebird_daemon_startup_script:builds/install/arch-specific/freebsd/firebird_daemon_startup_script.in
gen/firebird/bin/freebsdLibrary.sh:builds/install/arch-specific/freebsd/freebsdLibrary.sh.in]
,[chmod a+x gen/install/*.sh gen/firebird/bin/*sh 2>/dev/null])
;;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-06-04 03:31:22
|
Revision: 53112
http://firebird.svn.sourceforge.net/firebird/?rev=53112&view=rev
Author: firebirds
Date: 2011-06-04 03:31:14 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-06-04 03:17:34 UTC (rev 53111)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-06-04 03:31:14 UTC (rev 53112)
@@ -1,3 +1,21 @@
+ 2011-06-03 16:58 dimitr
+ M doc/WhatsNew
+Updated the docs.
+
+ 2011-06-03 14:10 alexpeshkoff
+ M src/jrd/trace/TraceLog.cpp
+Backported CORE-3512: Server hangs when trace is running
+
+ 2011-06-03 09:52 alexpeshkoff
+ A builds/install/arch-specific/freebsd/firebird_daemon_startup_script.in
+ M builds/install/arch-specific/freebsd/freebsdLibrary.sh.in
+ M builds/install/arch-specific/freebsd/install.sh.in
+ M builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
+ M builds/install/misc/changeMultiConnectMode.sh.in
+ M builds/install/misc/posixLibrary.sh.in
+ M configure.in
+Fixed CORE-2921: 'make install' does not work on freebsd
+
2011-06-02 13:48 dimitr
M src/jrd/DatabaseSnapshot.cpp
Fixed CORE-3508: MON$DATABASE_NAME and MON$ATTACHMENT_NAME fields contain question marks instead of non-ASCII characters regardless of the connection charset.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-04 03:17:34 UTC (rev 53111)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-04 03:31:14 UTC (rev 53112)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26302
+ FORMAL BUILD NUMBER:26305
*/
-#define PRODUCT_VER_STRING "2.5.1.26302"
-#define FILE_VER_STRING "WI-V2.5.1.26302"
-#define LICENSE_VER_STRING "WI-V2.5.1.26302"
-#define FILE_VER_NUMBER 2, 5, 1, 26302
+#define PRODUCT_VER_STRING "2.5.1.26305"
+#define FILE_VER_STRING "WI-V2.5.1.26305"
+#define LICENSE_VER_STRING "WI-V2.5.1.26305"
+#define FILE_VER_NUMBER 2, 5, 1, 26305
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26302"
+#define FB_BUILD_NO "26305"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-04 03:17:34 UTC (rev 53111)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-04 03:31:14 UTC (rev 53112)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26302
+BuildNum=26305
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2011-06-04 18:42:43
|
Revision: 53114
http://firebird.svn.sourceforge.net/firebird/?rev=53114&view=rev
Author: asfernandes
Date: 2011-06-04 18:42:37 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
Backport fix for CORE-3479 - ASCII_VAL raises error instead of return 0 for empty strings.
Modified Paths:
--------------
firebird/branches/B2_5_Release/doc/WhatsNew
firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp
Modified: firebird/branches/B2_5_Release/doc/WhatsNew
===================================================================
--- firebird/branches/B2_5_Release/doc/WhatsNew 2011-06-04 03:38:33 UTC (rev 53113)
+++ firebird/branches/B2_5_Release/doc/WhatsNew 2011-06-04 18:42:37 UTC (rev 53114)
@@ -49,6 +49,11 @@
Contributor(s):
Alex Peshkov <peshkoff at mail.ru>
+ * Bugfix CORE-3479
+ ASCII_VAL raises error instead of return 0 for empty strings.
+ Contributor(s):
+ Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
* Bugfix CORE-3477
Passing non-existing SQL parameters always crash server
Contributor(s):
Modified: firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp 2011-06-04 03:38:33 UTC (rev 53113)
+++ firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp 2011-06-04 18:42:37 UTC (rev 53114)
@@ -1153,12 +1153,19 @@
UCHAR* p;
MoveBuffer temp;
int length = MOV_make_string2(tdbb, value, value->getCharSet(), &p, temp);
- UCHAR dummy[4];
- if (cs->substring(length, p, sizeof(dummy), dummy, 0, 1) != 1)
- status_exception::raise(Arg::Gds(isc_arith_except) << Arg::Gds(isc_transliteration_failed));
+ if (length == 0)
+ impure->vlu_misc.vlu_short = 0;
+ else
+ {
+ UCHAR dummy[4];
- impure->vlu_misc.vlu_short = (length > 0 ? p[0] : 0);
+ if (cs->substring(length, p, sizeof(dummy), dummy, 0, 1) != 1)
+ status_exception::raise(Arg::Gds(isc_arith_except) << Arg::Gds(isc_transliteration_failed));
+
+ impure->vlu_misc.vlu_short = p[0];
+ }
+
impure->vlu_desc.makeShort(0, &impure->vlu_misc.vlu_short);
return &impure->vlu_desc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2011-06-04 18:43:17
|
Revision: 53115
http://firebird.svn.sourceforge.net/firebird/?rev=53115&view=rev
Author: asfernandes
Date: 2011-06-04 18:43:10 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
Backport fix for CORE-3511 - Unquoted role names with non-ASCII characters passed in DPB are upper-cased wrongly.
Modified Paths:
--------------
firebird/branches/B2_5_Release/doc/WhatsNew
firebird/branches/B2_5_Release/src/jrd/IntlUtil.cpp
firebird/branches/B2_5_Release/src/jrd/IntlUtil.h
firebird/branches/B2_5_Release/src/jrd/jrd.cpp
Modified: firebird/branches/B2_5_Release/doc/WhatsNew
===================================================================
--- firebird/branches/B2_5_Release/doc/WhatsNew 2011-06-04 18:42:37 UTC (rev 53114)
+++ firebird/branches/B2_5_Release/doc/WhatsNew 2011-06-04 18:43:10 UTC (rev 53115)
@@ -7,6 +7,11 @@
Contributor(s):
Alex Peshkov <peshkoff at mail.ru>
+ * Bugfix CORE-3511
+ Unquoted role names with non-ASCII characters passed in DPB are upper-cased wrongly.
+ Contributor(s):
+ Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
* Bugfix CORE-3508
MON$DATABASE_NAME and MON$ATTACHMENT_NAME fields contain question marks
instead of non-ASCII characters regardless of the connection charset
Modified: firebird/branches/B2_5_Release/src/jrd/IntlUtil.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/IntlUtil.cpp 2011-06-04 18:42:37 UTC (rev 53114)
+++ firebird/branches/B2_5_Release/src/jrd/IntlUtil.cpp 2011-06-04 18:43:10 UTC (rev 53115)
@@ -74,6 +74,15 @@
ULONG dstLen, UCHAR* dst);
+GlobalPtr<IntlUtil::Utf8CharSet> IntlUtil::utf8CharSet;
+
+IntlUtil::Utf8CharSet::Utf8CharSet(MemoryPool& pool)
+{
+ IntlUtil::initUtf8Charset(&obj);
+ charSet = Jrd::CharSet::createInstance(pool, CS_UTF8, &obj);
+}
+
+
string IntlUtil::generateSpecificAttributes(Jrd::CharSet* cs, SpecificAttributesMap& map)
{
SpecificAttributesMap::Accessor accessor(&map);
@@ -557,6 +566,19 @@
}
+void IntlUtil::toUpper(Jrd::CharSet* cs, string& s)
+{
+ HalfStaticArray<UCHAR, BUFFER_SMALL> buffer;
+ size_t len = s.length();
+ ULONG count = toUpper(cs, len, (const UCHAR*) s.c_str(), len * 4, buffer.getBuffer(len * 4), NULL);
+
+ if (count != INTL_BAD_STR_LENGTH)
+ s.assign((const char*) buffer.begin(), count);
+ else
+ fb_assert(false);
+}
+
+
bool IntlUtil::readOneChar(Jrd::CharSet* cs, const UCHAR** s, const UCHAR* end, ULONG* size)
{
(*s) += *size;
Modified: firebird/branches/B2_5_Release/src/jrd/IntlUtil.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/IntlUtil.h 2011-06-04 18:42:37 UTC (rev 53114)
+++ firebird/branches/B2_5_Release/src/jrd/IntlUtil.h 2011-06-04 18:43:10 UTC (rev 53115)
@@ -28,8 +28,10 @@
#define JRD_INTLUTIL_H
#include "../common/classes/array.h"
+#include "../common/classes/auto.h"
#include "../common/classes/GenericMap.h"
#include "../common/classes/fb_string.h"
+#include "../common/classes/init.h"
#include "../jrd/intlobj_new.h"
namespace Jrd
@@ -46,6 +48,11 @@
typedef GenericMap<SpecificAttribute> SpecificAttributesMap;
public:
+ static Jrd::CharSet* getUtf8CharSet()
+ {
+ return utf8CharSet->charSet;
+ }
+
static string generateSpecificAttributes(Jrd::CharSet* cs, SpecificAttributesMap& map);
static bool parseSpecificAttributes(Jrd::CharSet* cs, ULONG len, const UCHAR* s,
SpecificAttributesMap* map);
@@ -77,6 +84,7 @@
const ULONG* exceptions);
static ULONG toUpper(Jrd::CharSet* cs, ULONG srcLen, const UCHAR* src, ULONG dstLen, UCHAR* dst,
const ULONG* exceptions);
+ static void toUpper(Jrd::CharSet* cs, string& s);
static bool readOneChar(Jrd::CharSet* cs, const UCHAR** s, const UCHAR* end, ULONG* size);
@@ -91,6 +99,19 @@
static bool readAttributeChar(Jrd::CharSet* cs, const UCHAR** s, const UCHAR* end, ULONG* size,
bool returnEscape);
+
+private:
+ class Utf8CharSet
+ {
+ public:
+ Utf8CharSet(MemoryPool& pool);
+
+ public:
+ charset obj;
+ AutoPtr<Jrd::CharSet> charSet;
+ };
+
+ static GlobalPtr<Utf8CharSet> utf8CharSet;
};
} // namespace Firebird
Modified: firebird/branches/B2_5_Release/src/jrd/jrd.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/jrd.cpp 2011-06-04 18:42:37 UTC (rev 53114)
+++ firebird/branches/B2_5_Release/src/jrd/jrd.cpp 2011-06-04 18:43:10 UTC (rev 53115)
@@ -1082,6 +1082,8 @@
{
attachment->att_requested_role = userId.usr_sql_role_name;
+ CharSet* utf8CharSet = IntlUtil::getUtf8CharSet();
+
switch (options.dpb_sql_dialect)
{
case 0:
@@ -1120,7 +1122,7 @@
case SQL_DIALECT_V5:
{
strip_quotes(userId.usr_sql_role_name);
- userId.usr_sql_role_name.upper();
+ IntlUtil::toUpper(utf8CharSet, userId.usr_sql_role_name);
}
break;
case SQL_DIALECT_V6_TRANSITION:
@@ -1151,9 +1153,7 @@
}
}
else
- {
- role.upper();
- }
+ IntlUtil::toUpper(utf8CharSet, role);
}
break;
default:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-06-05 03:23:04
|
Revision: 53116
http://firebird.svn.sourceforge.net/firebird/?rev=53116&view=rev
Author: firebirds
Date: 2011-06-05 03:22:58 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-06-04 18:43:10 UTC (rev 53115)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-06-05 03:22:58 UTC (rev 53116)
@@ -1,3 +1,15 @@
+ 2011-06-04 18:43 asfernandes
+ M doc/WhatsNew
+ M src/jrd/IntlUtil.cpp
+ M src/jrd/IntlUtil.h
+ M src/jrd/jrd.cpp
+Backport fix for CORE-3511 - Unquoted role names with non-ASCII characters passed in DPB are upper-cased wrongly.
+
+ 2011-06-04 18:42 asfernandes
+ M doc/WhatsNew
+ M src/jrd/SysFunction.cpp
+Backport fix for CORE-3479 - ASCII_VAL raises error instead of return 0 for empty strings.
+
2011-06-03 16:58 dimitr
M doc/WhatsNew
Updated the docs.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-04 18:43:10 UTC (rev 53115)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-05 03:22:58 UTC (rev 53116)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26305
+ FORMAL BUILD NUMBER:26307
*/
-#define PRODUCT_VER_STRING "2.5.1.26305"
-#define FILE_VER_STRING "WI-V2.5.1.26305"
-#define LICENSE_VER_STRING "WI-V2.5.1.26305"
-#define FILE_VER_NUMBER 2, 5, 1, 26305
+#define PRODUCT_VER_STRING "2.5.1.26307"
+#define FILE_VER_STRING "WI-V2.5.1.26307"
+#define LICENSE_VER_STRING "WI-V2.5.1.26307"
+#define FILE_VER_NUMBER 2, 5, 1, 26307
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26305"
+#define FB_BUILD_NO "26307"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-04 18:43:10 UTC (rev 53115)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-05 03:22:58 UTC (rev 53116)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26305
+BuildNum=26307
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-06-06 03:21:44
|
Revision: 53123
http://firebird.svn.sourceforge.net/firebird/?rev=53123&view=rev
Author: firebirds
Date: 2011-06-06 03:21:37 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-06-06 03:15:20 UTC (rev 53122)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-06-06 03:21:37 UTC (rev 53123)
@@ -1,3 +1,10 @@
+ 2011-06-05 08:17 hvlad
+ M src/jrd/dpm.epp
+ M src/jrd/dpm_proto.h
+ M src/jrd/idx.cpp
+ M src/jrd/vio.cpp
+Fixed bug CORE-3515 : Index corruption. Validation put "missing entries" message into firebird.log
+
2011-06-04 18:43 asfernandes
M doc/WhatsNew
M src/jrd/IntlUtil.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-06 03:15:20 UTC (rev 53122)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-06 03:21:37 UTC (rev 53123)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26307
+ FORMAL BUILD NUMBER:26308
*/
-#define PRODUCT_VER_STRING "2.5.1.26307"
-#define FILE_VER_STRING "WI-V2.5.1.26307"
-#define LICENSE_VER_STRING "WI-V2.5.1.26307"
-#define FILE_VER_NUMBER 2, 5, 1, 26307
+#define PRODUCT_VER_STRING "2.5.1.26308"
+#define FILE_VER_STRING "WI-V2.5.1.26308"
+#define LICENSE_VER_STRING "WI-V2.5.1.26308"
+#define FILE_VER_NUMBER 2, 5, 1, 26308
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26307"
+#define FB_BUILD_NO "26308"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-06 03:15:20 UTC (rev 53122)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-06 03:21:37 UTC (rev 53123)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26307
+BuildNum=26308
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2011-06-17 01:20:47
|
Revision: 53185
http://firebird.svn.sourceforge.net/firebird/?rev=53185&view=rev
Author: asfernandes
Date: 2011-06-17 01:20:41 +0000 (Fri, 17 Jun 2011)
Log Message:
-----------
Backported fix for CORE-3523 - SIMILAR TO: False matches on descending ranges.
Modified Paths:
--------------
firebird/branches/B2_5_Release/doc/WhatsNew
firebird/branches/B2_5_Release/src/jrd/SimilarToMatcher.h
Modified: firebird/branches/B2_5_Release/doc/WhatsNew
===================================================================
--- firebird/branches/B2_5_Release/doc/WhatsNew 2011-06-17 01:06:27 UTC (rev 53184)
+++ firebird/branches/B2_5_Release/doc/WhatsNew 2011-06-17 01:20:41 UTC (rev 53185)
@@ -2,6 +2,11 @@
* v2.5.1
**************************
+ * Bugfix CORE-3523
+ SIMILAR TO: False matches on descending ranges.
+ Contributor(s):
+ Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
* Bugfix CORE-3512
Server hangs when trace is running
Contributor(s):
Modified: firebird/branches/B2_5_Release/src/jrd/SimilarToMatcher.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/SimilarToMatcher.h 2011-06-17 01:06:27 UTC (rev 53184)
+++ firebird/branches/B2_5_Release/src/jrd/SimilarToMatcher.h 2011-06-17 01:20:41 UTC (rev 53185)
@@ -850,22 +850,11 @@
len = charSet->substring(originalPatternLen, originalPatternStr,
sizeof(c), c, patternPos - patternStart, 1);
- if (textType->compare(rangeBuffer[previousRangeBufferCount],
- &rangeBuffer[previousRangeBufferCount + 1], len, c) <= 0)
- {
- rangeBuffer.push(len);
- rangeCount = rangeBuffer.getCount();
- memcpy(rangeBuffer.getBuffer(rangeCount + len) + rangeCount, &c, len);
+ rangeBuffer.push(len);
+ rangeCount = rangeBuffer.getCount();
+ memcpy(rangeBuffer.getBuffer(rangeCount + len) + rangeCount, &c, len);
- charsBuffer.push(*patternPos);
- }
- else
- {
- rangeBuffer.shrink(previousRangeBufferCount);
- charsBuffer.pop();
- }
-
- ++patternPos;
+ charsBuffer.push(*patternPos++);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <asf...@us...> - 2011-06-18 18:50:04
|
Revision: 53192
http://firebird.svn.sourceforge.net/firebird/?rev=53192&view=rev
Author: asfernandes
Date: 2011-06-18 18:49:58 +0000 (Sat, 18 Jun 2011)
Log Message:
-----------
Backported fix for CORE-3140 - Preserve comments for parameters after altering procedures.
Modified Paths:
--------------
firebird/branches/B2_5_Release/doc/WhatsNew
firebird/branches/B2_5_Release/src/dsql/ddl.cpp
firebird/branches/B2_5_Release/src/dsql/metd.epp
firebird/branches/B2_5_Release/src/dsql/metd_proto.h
firebird/branches/B2_5_Release/src/jrd/irq.h
Modified: firebird/branches/B2_5_Release/doc/WhatsNew
===================================================================
--- firebird/branches/B2_5_Release/doc/WhatsNew 2011-06-17 15:34:37 UTC (rev 53191)
+++ firebird/branches/B2_5_Release/doc/WhatsNew 2011-06-18 18:49:58 UTC (rev 53192)
@@ -498,6 +498,11 @@
Contributor(s):
Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+ * Bugfix CORE-3140
+ Preserve comments for parameters after altering procedures.
+ Contributor(s):
+ Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
* Bugfix CORE-3138
Internal error or crash occurs when accessing any MON$ table after altering its structure
Contributor(s):
Modified: firebird/branches/B2_5_Release/src/dsql/ddl.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/dsql/ddl.cpp 2011-06-17 15:34:37 UTC (rev 53191)
+++ firebird/branches/B2_5_Release/src/dsql/ddl.cpp 2011-06-18 18:49:58 UTC (rev 53192)
@@ -2473,6 +2473,20 @@
statement->append_number(isc_dyn_prm_number, position);
statement->append_number(isc_dyn_prm_type, 0);
+ if (op == nod_mod_procedure && !modifyInputs.exist(field->fld_name))
+ {
+ UCharBuffer description;
+
+ METD_get_procedure_parameter(statement, procedure_name->str_data, field->fld_name,
+ description);
+
+ if (description.hasData())
+ {
+ statement->append_string(isc_dyn_description,
+ (const char*) description.begin(), description.getCount());
+ }
+ }
+
DDL_resolve_intl_type(statement, field,
reinterpret_cast<const dsql_str*>(parameter->nod_arg[e_dfl_collate]));
put_field(statement, field, false);
Modified: firebird/branches/B2_5_Release/src/dsql/metd.epp
===================================================================
--- firebird/branches/B2_5_Release/src/dsql/metd.epp 2011-06-17 15:34:37 UTC (rev 53191)
+++ firebird/branches/B2_5_Release/src/dsql/metd.epp 2011-06-18 18:49:58 UTC (rev 53192)
@@ -1367,6 +1367,46 @@
}
+// Get the description of a procedure parameter. The description is returned in the client charset.
+void METD_get_procedure_parameter(CompiledStatement* statement, const MetaName& procedure,
+ const MetaName& parameter, UCharBuffer& buffer)
+{
+ thread_db* tdbb = JRD_get_thread_data();
+
+ dsql_dbb* dbb = statement->req_dbb;
+
+ MutexHolder holder(statement);
+
+ validateTransaction(statement);
+
+ buffer.clear();
+
+ jrd_req* handle = CMP_find_request(tdbb, irq_parameters_description, IRQ_REQUESTS);
+
+ FOR(REQUEST_HANDLE handle TRANSACTION_HANDLE statement->req_transaction)
+ X IN RDB$PROCEDURE_PARAMETERS
+ WITH X.RDB$PROCEDURE_NAME EQ procedure.c_str() AND
+ X.RDB$PARAMETER_NAME EQ parameter.c_str() AND
+ X.RDB$DESCRIPTION NOT MISSING
+ {
+ if (!DSQL_REQUEST(irq_parameters_description))
+ DSQL_REQUEST(irq_parameters_description) = handle;
+
+ UCharBuffer bpb;
+ BLB_gen_bpb(isc_blob_text, isc_blob_text, CS_METADATA, CS_dynamic, bpb);
+
+ blb* blob = BLB_open2(tdbb, statement->req_transaction, &X.RDB$DESCRIPTION,
+ bpb.getCount(), bpb.begin());
+ buffer.resize(blob->blb_length);
+ BLB_get_data(tdbb, blob, buffer.begin(), buffer.getCount());
+ }
+ END_FOR
+
+ if (!DSQL_REQUEST(irq_parameters_description))
+ DSQL_REQUEST(irq_parameters_description) = handle;
+}
+
+
dsql_rel* METD_get_relation(CompiledStatement* statement, const char* name)
{
/**************************************
Modified: firebird/branches/B2_5_Release/src/dsql/metd_proto.h
===================================================================
--- firebird/branches/B2_5_Release/src/dsql/metd_proto.h 2011-06-17 15:34:37 UTC (rev 53191)
+++ firebird/branches/B2_5_Release/src/dsql/metd_proto.h 2011-06-18 18:49:58 UTC (rev 53192)
@@ -57,6 +57,9 @@
Jrd::dsql_udf* METD_get_function(Jrd::dsql_req*, const Jrd::dsql_str*);
Jrd::dsql_nod* METD_get_primary_key(Jrd::dsql_req*, const Jrd::dsql_str*);
Jrd::dsql_prc* METD_get_procedure(Jrd::CompiledStatement*, const Jrd::dsql_str*);
+void METD_get_procedure_parameter(Jrd::CompiledStatement* statement,
+ const Firebird::MetaName& procedure, const Firebird::MetaName& parameter,
+ Firebird::UCharBuffer& buffer);
Jrd::dsql_rel* METD_get_relation(Jrd::CompiledStatement*, const char*);
bool METD_get_trigger(Jrd::dsql_req*, const Jrd::dsql_str*, Jrd::dsql_str**, USHORT*);
bool METD_get_type(Jrd::dsql_req*, const Jrd::dsql_str*, const char*, SSHORT*);
Modified: firebird/branches/B2_5_Release/src/jrd/irq.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/irq.h 2011-06-17 15:34:37 UTC (rev 53191)
+++ firebird/branches/B2_5_Release/src/jrd/irq.h 2011-06-18 18:49:58 UTC (rev 53192)
@@ -141,6 +141,7 @@
irq_procedure, // DSQL/METD: lookup a stored procedure
irq_parameters, // DSQL/METD: lookup a procedure's parameters
irq_parameters2, // DSQL/METD: lookup a procedure's parameters (ODS 11.1)
+ irq_parameters_description, // DSQL/METD: lookup a procedure's parameters description
irq_collation, // DSQL/METD: lookup a collation name
irq_charset, // DSQL/METD: lookup a character set
irq_trigger, // DSQL/METD: lookup a trigger
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-06-22 03:25:49
|
Revision: 53202
http://firebird.svn.sourceforge.net/firebird/?rev=53202&view=rev
Author: firebirds
Date: 2011-06-22 03:25:43 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-06-22 03:18:25 UTC (rev 53201)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-06-22 03:25:43 UTC (rev 53202)
@@ -1,3 +1,62 @@
+ 2011-06-21 09:06 alexpeshkoff
+ M src/jrd/trace/TraceConfigStorage.cpp
+ M src/jrd/trace/TraceConfigStorage.h
+Fixed CORE-3532: Server hangs starting new session when trace is running
+
+ 2011-06-20 08:41 dimitr
+ M doc/WhatsNew
+Updated docs.
+
+ 2011-06-19 13:59 dimitr
+ M doc/WhatsNew
+Updated docs.
+
+ 2011-06-18 18:49 asfernandes
+ M doc/WhatsNew
+ M src/dsql/ddl.cpp
+ M src/dsql/metd.epp
+ M src/dsql/metd_proto.h
+ M src/jrd/irq.h
+Backported fix for CORE-3140 - Preserve comments for parameters after altering procedures.
+
+ 2011-06-17 12:41 hvlad
+ M src/jrd/cmp.cpp
+Fixed bug CORE-3524 : Compiling stored procedure while in use shutdown database
+
+ 2011-06-17 01:20 asfernandes
+ M doc/WhatsNew
+ M src/jrd/SimilarToMatcher.h
+Backported fix for CORE-3523 - SIMILAR TO: False matches on descending ranges.
+
+ 2011-06-16 09:11 hvlad
+ M src/jrd/cch.cpp
+ M src/jrd/nbak.cpp
+ M src/jrd/nbak.h
+Backport fix for bug CORE-3521 : Delta file contents is not flushed to disk
+
+ 2011-06-16 08:44 hvlad
+ M src/jrd/tra.cpp
+ M src/jrd/tra.h
+Fixed bug CORE-3525 : Autonomous transactions should not inherit run-time flags of "parent" transaction
+
+ 2011-06-15 08:30 paulbeach
+ M builds/posix/prefix.darwin_i386
+Fix typo
+
+ 2011-06-11 06:06 robocop
+ M src/jrd/IntlUtil.h
+Misc.
+
+ 2011-06-08 08:57 hvlad
+ M src/jrd/Relation.h
+ M src/jrd/dfw.epp
+ M src/jrd/ini.epp
+ M src/jrd/met.epp
+ M src/jrd/met_proto.h
+Backport fix for two related bugs
+CORE-3502 : DROP VIEW ignores the existing non-column dependencies, and
+CORE-3503 : ALTER VIEW crashes the server if the new version has an artificial (aggregate or union) stream at the position of a regular context in the older version.
+
2011-06-05 08:17 hvlad
M src/jrd/dpm.epp
M src/jrd/dpm_proto.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-22 03:18:25 UTC (rev 53201)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-22 03:25:43 UTC (rev 53202)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26308
+ FORMAL BUILD NUMBER:26319
*/
-#define PRODUCT_VER_STRING "2.5.1.26308"
-#define FILE_VER_STRING "WI-V2.5.1.26308"
-#define LICENSE_VER_STRING "WI-V2.5.1.26308"
-#define FILE_VER_NUMBER 2, 5, 1, 26308
+#define PRODUCT_VER_STRING "2.5.1.26319"
+#define FILE_VER_STRING "WI-V2.5.1.26319"
+#define LICENSE_VER_STRING "WI-V2.5.1.26319"
+#define FILE_VER_NUMBER 2, 5, 1, 26319
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26308"
+#define FB_BUILD_NO "26319"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-22 03:18:25 UTC (rev 53201)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-22 03:25:43 UTC (rev 53202)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26308
+BuildNum=26319
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-06-25 03:24:10
|
Revision: 53234
http://firebird.svn.sourceforge.net/firebird/?rev=53234&view=rev
Author: firebirds
Date: 2011-06-25 03:24:04 +0000 (Sat, 25 Jun 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-06-25 03:17:23 UTC (rev 53233)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-06-25 03:24:04 UTC (rev 53234)
@@ -1,3 +1,39 @@
+ 2011-06-24 13:14 hvlad
+ M src/jrd/tra.cpp
+ M src/jrd/vio.cpp
+ M src/jrd/vio_proto.h
+Backport improvement CORE-3537 : There is no need to undo changes made in GTT created with ON COMMIT DELETE ROWS option when transaction is rolled back.
+
+ 2011-06-24 13:08 hvlad
+ M src/jrd/jrd.h
+ M src/jrd/tra.cpp
+ M src/jrd/tra.h
+ M src/jrd/vio.cpp
+Backport improvement CORE-3536 : Garbage collection in GTT is unnecessary delayed by active transactions in another attachments
+
+ 2011-06-24 11:52 hvlad
+ M src/jrd/vio.cpp
+Delete deferred work when savepoint is cleaned up after failure even if no records was modified. Else DFW task will be repeated at commit making system tables logically inconsistent.
+
+ 2011-06-24 11:48 hvlad
+ M src/jrd/tra.cpp
+Backported : don't try to undo changes when invalidated transaction is rolled back. I.e. force rollback via TIP if transaction was invalidated.
+
+ 2011-06-24 11:42 hvlad
+ M src/jrd/cch.cpp
+Additional fix for correct Nbackup state lock accounting. See also CORE-3465
+
+ 2011-06-24 08:56 hvlad
+ M src/jrd/nbak.cpp
+ M src/jrd/nbak.h
+Fixed bug CORE-3535 : Write target of dirty page could be undefined if error happens when nbackup state is changed.
+Also prevent overwriting of first page of allocation table by data page contents.
+
+ 2011-06-24 08:17 hvlad
+ M src/jrd/nbak.h
+Additional patch for CORE-3521.
+When CCH_flush() is called after last disconnect there is no attachment.
+
2011-06-21 09:06 alexpeshkoff
M src/jrd/trace/TraceConfigStorage.cpp
M src/jrd/trace/TraceConfigStorage.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-25 03:17:23 UTC (rev 53233)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-25 03:24:04 UTC (rev 53234)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26319
+ FORMAL BUILD NUMBER:26326
*/
-#define PRODUCT_VER_STRING "2.5.1.26319"
-#define FILE_VER_STRING "WI-V2.5.1.26319"
-#define LICENSE_VER_STRING "WI-V2.5.1.26319"
-#define FILE_VER_NUMBER 2, 5, 1, 26319
+#define PRODUCT_VER_STRING "2.5.1.26326"
+#define FILE_VER_STRING "WI-V2.5.1.26326"
+#define LICENSE_VER_STRING "WI-V2.5.1.26326"
+#define FILE_VER_NUMBER 2, 5, 1, 26326
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26319"
+#define FB_BUILD_NO "26326"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-25 03:17:23 UTC (rev 53233)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-25 03:24:04 UTC (rev 53234)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26319
+BuildNum=26326
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-06-26 03:23:54
|
Revision: 53239
http://firebird.svn.sourceforge.net/firebird/?rev=53239&view=rev
Author: firebirds
Date: 2011-06-26 03:23:48 +0000 (Sun, 26 Jun 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-06-26 03:17:03 UTC (rev 53238)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-06-26 03:23:48 UTC (rev 53239)
@@ -1,3 +1,8 @@
+ 2011-06-25 03:33 robocop
+ M src/jrd/tra.cpp
+ M src/jrd/vio.cpp
+Misc.
+
2011-06-24 13:14 hvlad
M src/jrd/tra.cpp
M src/jrd/vio.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-26 03:17:03 UTC (rev 53238)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-26 03:23:48 UTC (rev 53239)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26326
+ FORMAL BUILD NUMBER:26327
*/
-#define PRODUCT_VER_STRING "2.5.1.26326"
-#define FILE_VER_STRING "WI-V2.5.1.26326"
-#define LICENSE_VER_STRING "WI-V2.5.1.26326"
-#define FILE_VER_NUMBER 2, 5, 1, 26326
+#define PRODUCT_VER_STRING "2.5.1.26327"
+#define FILE_VER_STRING "WI-V2.5.1.26327"
+#define LICENSE_VER_STRING "WI-V2.5.1.26327"
+#define FILE_VER_NUMBER 2, 5, 1, 26327
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26326"
+#define FB_BUILD_NO "26327"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-26 03:17:03 UTC (rev 53238)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-26 03:23:48 UTC (rev 53239)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26326
+BuildNum=26327
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-06-27 03:22:59
|
Revision: 53246
http://firebird.svn.sourceforge.net/firebird/?rev=53246&view=rev
Author: firebirds
Date: 2011-06-27 03:22:53 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-06-27 03:16:27 UTC (rev 53245)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-06-27 03:22:53 UTC (rev 53246)
@@ -1,3 +1,7 @@
+ 2011-06-26 22:27 hvlad
+ M src/dsql/ddl.cpp
+Fixed bug CORE-3509 : Alter procedure allows to add the parameter with the same name.
+
2011-06-25 03:33 robocop
M src/jrd/tra.cpp
M src/jrd/vio.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-27 03:16:27 UTC (rev 53245)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-06-27 03:22:53 UTC (rev 53246)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26327
+ FORMAL BUILD NUMBER:26328
*/
-#define PRODUCT_VER_STRING "2.5.1.26327"
-#define FILE_VER_STRING "WI-V2.5.1.26327"
-#define LICENSE_VER_STRING "WI-V2.5.1.26327"
-#define FILE_VER_NUMBER 2, 5, 1, 26327
+#define PRODUCT_VER_STRING "2.5.1.26328"
+#define FILE_VER_STRING "WI-V2.5.1.26328"
+#define LICENSE_VER_STRING "WI-V2.5.1.26328"
+#define FILE_VER_NUMBER 2, 5, 1, 26328
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26327"
+#define FB_BUILD_NO "26328"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-27 03:16:27 UTC (rev 53245)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-06-27 03:22:53 UTC (rev 53246)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26327
+BuildNum=26328
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2011-07-01 10:15:56
|
Revision: 53269
http://firebird.svn.sourceforge.net/firebird/?rev=53269&view=rev
Author: alexpeshkoff
Date: 2011-07-01 10:15:49 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
This appears to fix CORE-3400: Server crash every 3 hour (FreeBSD8.2R), but I did not get final confirmation from the reporter too long
Modified Paths:
--------------
firebird/branches/B2_5_Release/doc/README.build.posix.html
firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp
Modified: firebird/branches/B2_5_Release/doc/README.build.posix.html
===================================================================
--- firebird/branches/B2_5_Release/doc/README.build.posix.html 2011-07-01 09:22:23 UTC (rev 53268)
+++ firebird/branches/B2_5_Release/doc/README.build.posix.html 2011-07-01 10:15:49 UTC (rev 53269)
@@ -232,6 +232,9 @@
<li>
<a href="#sol2">Solaris 10, Intel</a>
</li>
+ <li>
+ <a href="#freebsd">FreeBSD</a>
+ </li>
</ul>
<h1>
<a name="preparing" id="preparing">3.0 Preparing to Build
@@ -674,6 +677,17 @@
Frequently Tested
</td>
</tr>
+ <tr class="rarely">
+ <td>
+ FreeBSD 8, AMD64/i386
+ </td>
+ <td>
+ g++ 4.2.1
+ </td>
+ <td>
+ Rarely Tested
+ </td>
+ </tr>
</table>
<h2>
<a name="aix1" id="aix1">4.1 AIX 6.1 on Power, IBM XL C++</a>
@@ -836,6 +850,35 @@
generic (-xarch=generic). Enthusiasts may add -xarch=native to the CFLAGS/CXXFLAGS,
which tunes for the processor on which the compiler is running.
</p>
+ <h2>
+ <a name="freebsd" id="freebsd">4.8 FreeBSD, g++</a>
+ </h2>
+ <p>
+ Firebird runs on freebsd, but not too efficient - that OS is missing support of
+ futex in shared memory. Therefore SystemV semaphores are used, which is not too efficient.
+ To build and run firebird you should tune kernel. The following IPC settings are known to work OK:
+ </p>
+ <pre>
+# ipcs -S
+seminfo:
+semmap: 1024(# of entries in semaphore map)
+semmni: 1024(# of semaphore identifiers)
+semmns: 2048(# of semaphores in system)
+semmnu: 128(# of undo structures in system)
+semmsl: 1024(max # of semaphores per id)
+semopm: 100(max # of operations per semop call)
+semume: 10(max # of undo entries per process)
+semusz: 152(size in bytes of undo structure)
+semvmx: 32767(semaphore maximum value)
+semaem: 16384(adjust on exit max value)
+</pre>
+ <p>
+ Please pass the following parameter to autogen.sh or configure: <br>
+ --with-system-editline <br>
+ or: <br>
+ --without-editline (this will break command line editing in isql) <br>
+ Builtin library does not compile on FreeBSD!
+ </p>
<h1>
<a name="testing" id="testing">5.0 Testing in Place</a>
</h1>
Modified: firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp 2011-07-01 09:22:23 UTC (rev 53268)
+++ firebird/branches/B2_5_Release/src/jrd/isc_sync.cpp 2011-07-01 10:15:49 UTC (rev 53269)
@@ -320,8 +320,8 @@
public:
const static int N_FILES = 8;
const static int N_SETS = 256;
-#if defined(DEV_BUILD) || defined(FREEBSD)
- const static int SEM_PER_SET = 4; // force multiple sets allocation || work with default freebsd kernel
+#if defined(DEV_BUILD)
+ const static int SEM_PER_SET = 4; // force multiple sets allocation
#else
const static int SEM_PER_SET = 31; // hard limit for some old systems, might set to 32
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-07-01 11:28:59
|
Revision: 53272
http://firebird.svn.sourceforge.net/firebird/?rev=53272&view=rev
Author: firebirds
Date: 2011-07-01 11:28:52 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-07-01 11:08:17 UTC (rev 53271)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-07-01 11:28:52 UTC (rev 53272)
@@ -1,3 +1,23 @@
+ 2011-07-01 10:39 alexpeshkoff
+ M doc/WhatsNew
+updated
+
+ 2011-07-01 10:15 alexpeshkoff
+ M doc/README.build.posix.html
+ M src/jrd/isc_sync.cpp
+This appears to fix CORE-3400: Server crash every 3 hour (FreeBSD8.2R), but I did not get final confirmation from the reporter too long
+
+ 2011-07-01 09:22 alexpeshkoff
+ M builds/install/arch-specific/hpux/Makefile.in
+ M builds/install/arch-specific/linux/Makefile.in
+ M builds/install/arch-specific/linux/misc/tarMainInstall.sh.in
+ M builds/install/arch-specific/netbsd/Makefile.in
+Fixed CORE-3544: make install fails
+
+ 2011-07-01 08:35 dimitr
+ M src/jrd/nbak.h
+Misc.
+
2011-06-26 22:27 hvlad
M src/dsql/ddl.cpp
Fixed bug CORE-3509 : Alter procedure allows to add the parameter with the same name.
@@ -19308,7 +19328,7 @@
2008-11-29 18:47 asfernandes
M src/jrd/DataTypeUtil.cpp
M src/jrd/DataTypeUtil.h
-Fixed CORE-2019 ?\195?\162?\226?\130?\172?\226?\128?\156 UTF-8 conversion error (string truncation).
+Fixed CORE-2019 – UTF-8 conversion error (string truncation).
2008-11-28 18:49 alexpeshkoff
M src/common/classes/SafeArg.cpp
@@ -21660,7 +21680,7 @@
2008-07-16 14:16 asfernandes
M src/jrd/idx.cpp
-Fixed CORE-1989 - UTF8 UNICODE_CI collate can?\194?\180t be used in foreing key constraint
+Fixed CORE-1989 - UTF8 UNICODE_CI collate can´t be used in foreing key constraint
2008-07-16 13:55 asfernandes
M src/jrd/Optimizer.cpp
@@ -22668,7 +22688,7 @@
2008-06-14 02:17 asfernandes
M doc/sql.extensions/README.similar_to.txt
M src/jrd/SimilarToMatcher.h
-1) Fixed CORE-1935 ?\195?\162?\226?\130?\172?\226?\128?\156 SIMILAR TO character classes are incorrectly recognized.
+1) Fixed CORE-1935 – SIMILAR TO character classes are incorrectly recognized.
2) Improve the documentation after some questions from Claudio.
2008-06-13 14:01 dimitr
@@ -34936,7 +34956,7 @@
2007-05-09 15:23 asfernandes
M doc/sql.extensions/README.list
-Updated LIST documentation - thanks to Maycon Ferra?\195?\167a
+Updated LIST documentation - thanks to Maycon Ferraça
2007-05-09 02:03 asfernandes
M src/burp/burp.cpp
@@ -36887,7 +36907,7 @@
2007-03-22 13:07 asfernandes
M doc/sql.extensions/README.context_variables2
-Document the new context variable - thanks to Maicon Ferra?\195?\167a
+Document the new context variable - thanks to Maicon Ferraça
2007-03-22 12:53 dimitr
M src/dsql/pass1.cpp
@@ -38564,7 +38584,7 @@
2006-12-14 10:30 asfernandes
M doc/sql.extensions/README.returning
-Correction - thanks to Maycon Ferra?\195?\167a
+Correction - thanks to Maycon Ferraça
2006-12-14 09:14 dimitr
A doc/README.monitoring_tables
@@ -40008,7 +40028,7 @@
2006-10-10 03:53 asfernandes
M src/jrd/jrd.cpp
-Fix problem reported by Carsten Sch?\195?\164fer in fbdevel of incorrect server start when using connection pooling
+Fix problem reported by Carsten Schäfer in fbdevel of incorrect server start when using connection pooling
2006-10-10 03:39 asfernandes
M src/jrd/os/posix/isc_ipc.cpp
@@ -40357,7 +40377,7 @@
2006-09-13 12:59 asfernandes
M src/dsql/pass1.cpp
-Fix the problem with CAST and parameters reported by Maycon Ferra?\195?\167a in fb-devel
+Fix the problem with CAST and parameters reported by Maycon Ferraça in fb-devel
2006-09-12 16:31 asfernandes
M src/jrd/opt.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-01 11:08:17 UTC (rev 53271)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-01 11:28:52 UTC (rev 53272)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26328
+ FORMAL BUILD NUMBER:26332
*/
-#define PRODUCT_VER_STRING "2.5.1.26328"
-#define FILE_VER_STRING "WI-V2.5.1.26328"
-#define LICENSE_VER_STRING "WI-V2.5.1.26328"
-#define FILE_VER_NUMBER 2, 5, 1, 26328
+#define PRODUCT_VER_STRING "2.5.1.26332"
+#define FILE_VER_STRING "WI-V2.5.1.26332"
+#define LICENSE_VER_STRING "WI-V2.5.1.26332"
+#define FILE_VER_NUMBER 2, 5, 1, 26332
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26328"
+#define FB_BUILD_NO "26332"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-01 11:08:17 UTC (rev 53271)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-01 11:28:52 UTC (rev 53272)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26328
+BuildNum=26332
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-07-08 03:42:08
|
Revision: 53281
http://firebird.svn.sourceforge.net/firebird/?rev=53281&view=rev
Author: firebirds
Date: 2011-07-08 03:42:02 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-07-08 03:19:03 UTC (rev 53280)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-07-08 03:42:02 UTC (rev 53281)
@@ -1,3 +1,8 @@
+ 2011-07-07 16:24 dimitr
+ M src/jrd/btr.cpp
+ M src/jrd/sort.cpp
+Fixed CORE-3547: Floating-point negative zero doesn't match positive zero in the index.
+
2011-07-01 10:39 alexpeshkoff
M doc/WhatsNew
updated
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-08 03:19:03 UTC (rev 53280)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-08 03:42:02 UTC (rev 53281)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26332
+ FORMAL BUILD NUMBER:26333
*/
-#define PRODUCT_VER_STRING "2.5.1.26332"
-#define FILE_VER_STRING "WI-V2.5.1.26332"
-#define LICENSE_VER_STRING "WI-V2.5.1.26332"
-#define FILE_VER_NUMBER 2, 5, 1, 26332
+#define PRODUCT_VER_STRING "2.5.1.26333"
+#define FILE_VER_STRING "WI-V2.5.1.26333"
+#define LICENSE_VER_STRING "WI-V2.5.1.26333"
+#define FILE_VER_NUMBER 2, 5, 1, 26333
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26332"
+#define FB_BUILD_NO "26333"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-08 03:19:03 UTC (rev 53280)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-08 03:42:02 UTC (rev 53281)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26332
+BuildNum=26333
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-07-09 04:18:00
|
Revision: 53284
http://firebird.svn.sourceforge.net/firebird/?rev=53284&view=rev
Author: firebirds
Date: 2011-07-09 04:17:52 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-07-08 11:33:27 UTC (rev 53283)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-07-09 04:17:52 UTC (rev 53284)
@@ -1,3 +1,11 @@
+ 2011-07-08 11:33 paulbeach
+ M src/jrd/divorce.cpp
+Fix problem with fid's and GCD for MacOS 10.7 SuperServer
+
+ 2011-07-08 11:31 paulbeach
+ M configure.in
+False positive for fdatasync on MacOS
+
2011-07-07 16:24 dimitr
M src/jrd/btr.cpp
M src/jrd/sort.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-08 11:33:27 UTC (rev 53283)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-09 04:17:52 UTC (rev 53284)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26333
+ FORMAL BUILD NUMBER:26335
*/
-#define PRODUCT_VER_STRING "2.5.1.26333"
-#define FILE_VER_STRING "WI-V2.5.1.26333"
-#define LICENSE_VER_STRING "WI-V2.5.1.26333"
-#define FILE_VER_NUMBER 2, 5, 1, 26333
+#define PRODUCT_VER_STRING "2.5.1.26335"
+#define FILE_VER_STRING "WI-V2.5.1.26335"
+#define LICENSE_VER_STRING "WI-V2.5.1.26335"
+#define FILE_VER_NUMBER 2, 5, 1, 26335
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26333"
+#define FB_BUILD_NO "26335"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-08 11:33:27 UTC (rev 53283)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-09 04:17:52 UTC (rev 53284)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26333
+BuildNum=26335
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-07-13 03:23:39
|
Revision: 53291
http://firebird.svn.sourceforge.net/firebird/?rev=53291&view=rev
Author: firebirds
Date: 2011-07-13 03:23:27 +0000 (Wed, 13 Jul 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-07-13 03:17:02 UTC (rev 53290)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-07-13 03:23:27 UTC (rev 53291)
@@ -1,3 +1,8 @@
+ 2011-07-12 09:06 hvlad
+ M src/dsql/dsql.cpp
+ M src/dsql/dsql.h
+Fixed bug CORE-3533 : Firebird memory not released (Using superserver)
+
2011-07-08 11:33 paulbeach
M src/jrd/divorce.cpp
Fix problem with fid's and GCD for MacOS 10.7 SuperServer
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-13 03:17:02 UTC (rev 53290)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-13 03:23:27 UTC (rev 53291)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26335
+ FORMAL BUILD NUMBER:26336
*/
-#define PRODUCT_VER_STRING "2.5.1.26335"
-#define FILE_VER_STRING "WI-V2.5.1.26335"
-#define LICENSE_VER_STRING "WI-V2.5.1.26335"
-#define FILE_VER_NUMBER 2, 5, 1, 26335
+#define PRODUCT_VER_STRING "2.5.1.26336"
+#define FILE_VER_STRING "WI-V2.5.1.26336"
+#define LICENSE_VER_STRING "WI-V2.5.1.26336"
+#define FILE_VER_NUMBER 2, 5, 1, 26336
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26335"
+#define FB_BUILD_NO "26336"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-13 03:17:02 UTC (rev 53290)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-13 03:23:27 UTC (rev 53291)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26335
+BuildNum=26336
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-07-14 03:23:54
|
Revision: 53297
http://firebird.svn.sourceforge.net/firebird/?rev=53297&view=rev
Author: firebirds
Date: 2011-07-14 03:23:48 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-07-14 03:16:59 UTC (rev 53296)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-07-14 03:23:48 UTC (rev 53297)
@@ -1,3 +1,9 @@
+ 2011-07-13 15:10 dimitr
+ M src/jrd/sort.cpp
+ M src/jrd/sort.h
+Added the missing part for CORE-3547, related to BE platforms.
+Cleaned up the unused SKD_d_float.
+
2011-07-12 09:06 hvlad
M src/dsql/dsql.cpp
M src/dsql/dsql.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-14 03:16:59 UTC (rev 53296)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-14 03:23:48 UTC (rev 53297)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26336
+ FORMAL BUILD NUMBER:26337
*/
-#define PRODUCT_VER_STRING "2.5.1.26336"
-#define FILE_VER_STRING "WI-V2.5.1.26336"
-#define LICENSE_VER_STRING "WI-V2.5.1.26336"
-#define FILE_VER_NUMBER 2, 5, 1, 26336
+#define PRODUCT_VER_STRING "2.5.1.26337"
+#define FILE_VER_STRING "WI-V2.5.1.26337"
+#define LICENSE_VER_STRING "WI-V2.5.1.26337"
+#define FILE_VER_NUMBER 2, 5, 1, 26337
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26336"
+#define FB_BUILD_NO "26337"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-14 03:16:59 UTC (rev 53296)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-14 03:23:48 UTC (rev 53297)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26336
+BuildNum=26337
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-07-15 03:50:19
|
Revision: 53306
http://firebird.svn.sourceforge.net/firebird/?rev=53306&view=rev
Author: firebirds
Date: 2011-07-15 03:50:12 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-07-15 03:24:13 UTC (rev 53305)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-07-15 03:50:12 UTC (rev 53306)
@@ -1,3 +1,9 @@
+ 2011-07-14 15:54 dimitr
+ M src/dsql/dsql.cpp
+ M src/remote/interface.cpp
+ M src/remote/protocol.cpp
+Front ported CORE-3554: Server crashes during prepare or throws incorrect parsing error if the remotely passed SQL query is empty.
+
2011-07-13 15:10 dimitr
M src/jrd/sort.cpp
M src/jrd/sort.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-15 03:24:13 UTC (rev 53305)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-15 03:50:12 UTC (rev 53306)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26337
+ FORMAL BUILD NUMBER:26338
*/
-#define PRODUCT_VER_STRING "2.5.1.26337"
-#define FILE_VER_STRING "WI-V2.5.1.26337"
-#define LICENSE_VER_STRING "WI-V2.5.1.26337"
-#define FILE_VER_NUMBER 2, 5, 1, 26337
+#define PRODUCT_VER_STRING "2.5.1.26338"
+#define FILE_VER_STRING "WI-V2.5.1.26338"
+#define LICENSE_VER_STRING "WI-V2.5.1.26338"
+#define FILE_VER_NUMBER 2, 5, 1, 26338
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26337"
+#define FB_BUILD_NO "26338"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-15 03:24:13 UTC (rev 53305)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-15 03:50:12 UTC (rev 53306)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26337
+BuildNum=26338
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-07-17 03:23:40
|
Revision: 53324
http://firebird.svn.sourceforge.net/firebird/?rev=53324&view=rev
Author: firebirds
Date: 2011-07-17 03:23:34 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-07-17 03:17:31 UTC (rev 53323)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-07-17 03:23:34 UTC (rev 53324)
@@ -1,3 +1,7 @@
+ 2011-07-16 10:01 hvlad
+ M src/jrd/vio.cpp
+Fixed bug CORE-3557 : AV in engine when preparing query against dropping table
+
2011-07-14 15:54 dimitr
M src/dsql/dsql.cpp
M src/remote/interface.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-17 03:17:31 UTC (rev 53323)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-17 03:23:34 UTC (rev 53324)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26338
+ FORMAL BUILD NUMBER:26339
*/
-#define PRODUCT_VER_STRING "2.5.1.26338"
-#define FILE_VER_STRING "WI-V2.5.1.26338"
-#define LICENSE_VER_STRING "WI-V2.5.1.26338"
-#define FILE_VER_NUMBER 2, 5, 1, 26338
+#define PRODUCT_VER_STRING "2.5.1.26339"
+#define FILE_VER_STRING "WI-V2.5.1.26339"
+#define LICENSE_VER_STRING "WI-V2.5.1.26339"
+#define FILE_VER_NUMBER 2, 5, 1, 26339
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26338"
+#define FB_BUILD_NO "26339"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-17 03:17:31 UTC (rev 53323)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-17 03:23:34 UTC (rev 53324)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26338
+BuildNum=26339
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-07-18 03:25:49
|
Revision: 53332
http://firebird.svn.sourceforge.net/firebird/?rev=53332&view=rev
Author: firebirds
Date: 2011-07-18 03:25:42 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-07-18 03:18:40 UTC (rev 53331)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-07-18 03:25:42 UTC (rev 53332)
@@ -1,3 +1,7 @@
+ 2011-07-17 09:38 hvlad
+ M src/jrd/dfw.epp
+Fixed bug CORE-3549 : Database corruption after end of session : page xxx is of wrong type expected 4 found 7
+
2011-07-16 10:01 hvlad
M src/jrd/vio.cpp
Fixed bug CORE-3557 : AV in engine when preparing query against dropping table
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-18 03:18:40 UTC (rev 53331)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-18 03:25:42 UTC (rev 53332)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26339
+ FORMAL BUILD NUMBER:26340
*/
-#define PRODUCT_VER_STRING "2.5.1.26339"
-#define FILE_VER_STRING "WI-V2.5.1.26339"
-#define LICENSE_VER_STRING "WI-V2.5.1.26339"
-#define FILE_VER_NUMBER 2, 5, 1, 26339
+#define PRODUCT_VER_STRING "2.5.1.26340"
+#define FILE_VER_STRING "WI-V2.5.1.26340"
+#define LICENSE_VER_STRING "WI-V2.5.1.26340"
+#define FILE_VER_NUMBER 2, 5, 1, 26340
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26339"
+#define FB_BUILD_NO "26340"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-18 03:18:40 UTC (rev 53331)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-18 03:25:42 UTC (rev 53332)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26339
+BuildNum=26340
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-07-21 03:30:25
|
Revision: 53339
http://firebird.svn.sourceforge.net/firebird/?rev=53339&view=rev
Author: firebirds
Date: 2011-07-21 03:30:18 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/branches/B2_5_Release/ChangeLog
firebird/branches/B2_5_Release/src/jrd/build_no.h
firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog 2011-07-20 10:35:00 UTC (rev 53338)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-07-21 03:30:18 UTC (rev 53339)
@@ -1,3 +1,9 @@
+ 2011-07-20 10:35 dimitr
+ M src/jrd/cvt2.cpp
+ M src/jrd/cvt2_proto.h
+ M src/jrd/opt.cpp
+Attempted to have a [more or less] good solution for CORE-3553 (Nested loop plan is chosen instead of the sort merge for joining independent streams using keys of different types). It doesn't optimize all possible cases, but the most common ones.
+
2011-07-17 09:38 hvlad
M src/jrd/dfw.epp
Fixed bug CORE-3549 : Database corruption after end of session : page xxx is of wrong type expected 4 found 7
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-20 10:35:00 UTC (rev 53338)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-07-21 03:30:18 UTC (rev 53339)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26340
+ FORMAL BUILD NUMBER:26341
*/
-#define PRODUCT_VER_STRING "2.5.1.26340"
-#define FILE_VER_STRING "WI-V2.5.1.26340"
-#define LICENSE_VER_STRING "WI-V2.5.1.26340"
-#define FILE_VER_NUMBER 2, 5, 1, 26340
+#define PRODUCT_VER_STRING "2.5.1.26341"
+#define FILE_VER_STRING "WI-V2.5.1.26341"
+#define LICENSE_VER_STRING "WI-V2.5.1.26341"
+#define FILE_VER_NUMBER 2, 5, 1, 26341
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26340"
+#define FB_BUILD_NO "26341"
#define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5"
Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-20 10:35:00 UTC (rev 53338)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-07-21 03:30:18 UTC (rev 53339)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26340
+BuildNum=26341
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X