Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2011-10-14 03:29:25
|
Revision: 53572
http://firebird.svn.sourceforge.net/firebird/?rev=53572&view=rev
Author: firebirds
Date: 2011-10-14 03:29:18 +0000 (Fri, 14 Oct 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-10-14 03:19:48 UTC (rev 53571)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-10-14 03:29:18 UTC (rev 53572)
@@ -1,3 +1,7 @@
+ 2011-10-13 11:52 alexpeshkoff
+ M builds/install/arch-specific/linux/misc/firebird.init.d.suse.in
+misc
+
2011-10-12 19:00 hvlad
M src/jrd/idx.cpp
Backported fix for bug CORE-3631 : Duplicate records with NULLs checked incorrectly
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-10-14 03:19:48 UTC (rev 53571)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-10-14 03:29:18 UTC (rev 53572)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26382
+ FORMAL BUILD NUMBER:26383
*/
-#define PRODUCT_VER_STRING "2.5.2.26382"
-#define FILE_VER_STRING "WI-V2.5.2.26382"
-#define LICENSE_VER_STRING "WI-V2.5.2.26382"
-#define FILE_VER_NUMBER 2, 5, 2, 26382
+#define PRODUCT_VER_STRING "2.5.2.26383"
+#define FILE_VER_STRING "WI-V2.5.2.26383"
+#define LICENSE_VER_STRING "WI-V2.5.2.26383"
+#define FILE_VER_NUMBER 2, 5, 2, 26383
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26382"
+#define FB_BUILD_NO "26383"
#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-10-14 03:19:48 UTC (rev 53571)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-10-14 03:29:18 UTC (rev 53572)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26382
+BuildNum=26383
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-10-17 03:26:13
|
Revision: 53581
http://firebird.svn.sourceforge.net/firebird/?rev=53581&view=rev
Author: firebirds
Date: 2011-10-17 03:26:07 +0000 (Mon, 17 Oct 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-10-17 03:18:32 UTC (rev 53580)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-10-17 03:26:07 UTC (rev 53581)
@@ -1,3 +1,16 @@
+ 2011-10-16 14:11 hvlad
+ M src/jrd/trace/TraceConfigStorage.cpp
+One more assertion
+
+ 2011-10-16 13:59 hvlad
+ M src/jrd/trace/TraceConfigStorage.cpp
+Missed semicolon
+
+ 2011-10-16 13:49 hvlad
+ M src/jrd/trace/TraceConfigStorage.cpp
+ M src/jrd/trace/TraceConfigStorage.h
+Fixed bug CORE-3636 : Firebird 2.5.1 server crashes with Trace API
+
2011-10-13 11:52 alexpeshkoff
M builds/install/arch-specific/linux/misc/firebird.init.d.suse.in
misc
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-10-17 03:18:32 UTC (rev 53580)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-10-17 03:26:07 UTC (rev 53581)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26383
+ FORMAL BUILD NUMBER:26386
*/
-#define PRODUCT_VER_STRING "2.5.2.26383"
-#define FILE_VER_STRING "WI-V2.5.2.26383"
-#define LICENSE_VER_STRING "WI-V2.5.2.26383"
-#define FILE_VER_NUMBER 2, 5, 2, 26383
+#define PRODUCT_VER_STRING "2.5.2.26386"
+#define FILE_VER_STRING "WI-V2.5.2.26386"
+#define LICENSE_VER_STRING "WI-V2.5.2.26386"
+#define FILE_VER_NUMBER 2, 5, 2, 26386
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26383"
+#define FB_BUILD_NO "26386"
#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-10-17 03:18:32 UTC (rev 53580)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-10-17 03:26:07 UTC (rev 53581)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26383
+BuildNum=26386
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-11-01 03:28:40
|
Revision: 53603
http://firebird.svn.sourceforge.net/firebird/?rev=53603&view=rev
Author: firebirds
Date: 2011-11-01 03:28:33 +0000 (Tue, 01 Nov 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-10-31 18:35:59 UTC (rev 53602)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-11-01 03:28:33 UTC (rev 53603)
@@ -1,3 +1,9 @@
+ 2011-10-31 18:35 alexpeshkoff
+ M src/common/fb_exception.cpp
+ M src/common/thd.cpp
+ M src/common/thd.h
+Fixed CORE-3646: Segmentation fault in multi-threaded program when using 2.5.x client library on Linux
+
2011-10-16 14:11 hvlad
M src/jrd/trace/TraceConfigStorage.cpp
One more assertion
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-10-31 18:35:59 UTC (rev 53602)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-11-01 03:28:33 UTC (rev 53603)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26386
+ FORMAL BUILD NUMBER:26387
*/
-#define PRODUCT_VER_STRING "2.5.2.26386"
-#define FILE_VER_STRING "WI-V2.5.2.26386"
-#define LICENSE_VER_STRING "WI-V2.5.2.26386"
-#define FILE_VER_NUMBER 2, 5, 2, 26386
+#define PRODUCT_VER_STRING "2.5.2.26387"
+#define FILE_VER_STRING "WI-V2.5.2.26387"
+#define LICENSE_VER_STRING "WI-V2.5.2.26387"
+#define FILE_VER_NUMBER 2, 5, 2, 26387
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26386"
+#define FB_BUILD_NO "26387"
#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-10-31 18:35:59 UTC (rev 53602)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-11-01 03:28:33 UTC (rev 53603)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26386
+BuildNum=26387
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-11-08 03:28:46
|
Revision: 53611
http://firebird.svn.sourceforge.net/firebird/?rev=53611&view=rev
Author: firebirds
Date: 2011-11-08 03:28:40 +0000 (Tue, 08 Nov 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-11-08 03:21:20 UTC (rev 53610)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-11-08 03:28:40 UTC (rev 53611)
@@ -1,3 +1,12 @@
+ 2011-11-06 23:38 hvlad
+ M src/jrd/dyn_del.epp
+Additional fix for CORE-3557 : AV in engine when preparing query against dropping table
+Also fixed CORE-3579 : Can't drop table when computed field depends on later created another field
+
+ 2011-11-05 20:51 asfernandes
+ M src/jrd/intl.cpp
+Fixed CORE-3650 - Recreation of collation leads to FB "death".
+
2011-10-31 18:35 alexpeshkoff
M src/common/fb_exception.cpp
M src/common/thd.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-11-08 03:21:20 UTC (rev 53610)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-11-08 03:28:40 UTC (rev 53611)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26387
+ FORMAL BUILD NUMBER:26389
*/
-#define PRODUCT_VER_STRING "2.5.2.26387"
-#define FILE_VER_STRING "WI-V2.5.2.26387"
-#define LICENSE_VER_STRING "WI-V2.5.2.26387"
-#define FILE_VER_NUMBER 2, 5, 2, 26387
+#define PRODUCT_VER_STRING "2.5.2.26389"
+#define FILE_VER_STRING "WI-V2.5.2.26389"
+#define LICENSE_VER_STRING "WI-V2.5.2.26389"
+#define FILE_VER_NUMBER 2, 5, 2, 26389
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26387"
+#define FB_BUILD_NO "26389"
#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-11-08 03:21:20 UTC (rev 53610)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-11-08 03:28:40 UTC (rev 53611)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26387
+BuildNum=26389
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-11-15 03:27:40
|
Revision: 53635
http://firebird.svn.sourceforge.net/firebird/?rev=53635&view=rev
Author: firebirds
Date: 2011-11-15 03:27:33 +0000 (Tue, 15 Nov 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-11-15 03:20:50 UTC (rev 53634)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-11-15 03:27:33 UTC (rev 53635)
@@ -1,3 +1,7 @@
+ 2011-11-14 23:09 hvlad
+ M src/utilities/ntrace/fbtrace.conf
+Update documentation
+
2011-11-06 23:38 hvlad
M src/jrd/dyn_del.epp
Additional fix for 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-11-15 03:20:50 UTC (rev 53634)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-11-15 03:27:33 UTC (rev 53635)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26389
+ FORMAL BUILD NUMBER:26390
*/
-#define PRODUCT_VER_STRING "2.5.2.26389"
-#define FILE_VER_STRING "WI-V2.5.2.26389"
-#define LICENSE_VER_STRING "WI-V2.5.2.26389"
-#define FILE_VER_NUMBER 2, 5, 2, 26389
+#define PRODUCT_VER_STRING "2.5.2.26390"
+#define FILE_VER_STRING "WI-V2.5.2.26390"
+#define LICENSE_VER_STRING "WI-V2.5.2.26390"
+#define FILE_VER_NUMBER 2, 5, 2, 26390
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26389"
+#define FB_BUILD_NO "26390"
#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-11-15 03:20:50 UTC (rev 53634)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-11-15 03:27:33 UTC (rev 53635)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26389
+BuildNum=26390
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-12-02 03:30:42
|
Revision: 53659
http://firebird.svn.sourceforge.net/firebird/?rev=53659&view=rev
Author: firebirds
Date: 2011-12-02 03:30:35 +0000 (Fri, 02 Dec 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-12-02 03:23:47 UTC (rev 53658)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-02 03:30:35 UTC (rev 53659)
@@ -1,3 +1,11 @@
+ 2011-12-01 09:52 dimitr
+ M src/jrd/exe.cpp
+For a number of reasons, it seems being a good thing to unwind the trigger requests ASAP.
+
+ 2011-12-01 09:23 dimitr
+ M src/jrd/vio.cpp
+Attempted to fix CORE-3490: Concurrency problem when using named cursors. The solution may look sub-optimal but it doesn't seem to affect the performance.
+
2011-11-14 23:09 hvlad
M src/utilities/ntrace/fbtrace.conf
Update documentation
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-02 03:23:47 UTC (rev 53658)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-02 03:30:35 UTC (rev 53659)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26390
+ FORMAL BUILD NUMBER:26392
*/
-#define PRODUCT_VER_STRING "2.5.2.26390"
-#define FILE_VER_STRING "WI-V2.5.2.26390"
-#define LICENSE_VER_STRING "WI-V2.5.2.26390"
-#define FILE_VER_NUMBER 2, 5, 2, 26390
+#define PRODUCT_VER_STRING "2.5.2.26392"
+#define FILE_VER_STRING "WI-V2.5.2.26392"
+#define LICENSE_VER_STRING "WI-V2.5.2.26392"
+#define FILE_VER_NUMBER 2, 5, 2, 26392
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26390"
+#define FB_BUILD_NO "26392"
#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-12-02 03:23:47 UTC (rev 53658)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-02 03:30:35 UTC (rev 53659)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26390
+BuildNum=26392
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-12-06 03:28:09
|
Revision: 53671
http://firebird.svn.sourceforge.net/firebird/?rev=53671&view=rev
Author: firebirds
Date: 2011-12-06 03:28:01 +0000 (Tue, 06 Dec 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-12-06 03:21:23 UTC (rev 53670)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-06 03:28:01 UTC (rev 53671)
@@ -1,3 +1,11 @@
+ 2011-12-05 13:52 hvlad
+ M src/dsql/dsql.cpp
+Fixed bug CORE-3680 : EXECUTE BLOCK statement and ISC_DSQL_EXECUTE2() problem
+
+ 2011-12-05 13:08 hvlad
+ M src/dsql/pass1.cpp
+Fixed bug CORE-3690 : Wrong warning message for ambiguous query
+
2011-12-01 09:52 dimitr
M src/jrd/exe.cpp
For a number of reasons, it seems being a good thing to unwind the trigger requests ASAP.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-06 03:21:23 UTC (rev 53670)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-06 03:28:01 UTC (rev 53671)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26392
+ FORMAL BUILD NUMBER:26394
*/
-#define PRODUCT_VER_STRING "2.5.2.26392"
-#define FILE_VER_STRING "WI-V2.5.2.26392"
-#define LICENSE_VER_STRING "WI-V2.5.2.26392"
-#define FILE_VER_NUMBER 2, 5, 2, 26392
+#define PRODUCT_VER_STRING "2.5.2.26394"
+#define FILE_VER_STRING "WI-V2.5.2.26394"
+#define LICENSE_VER_STRING "WI-V2.5.2.26394"
+#define FILE_VER_NUMBER 2, 5, 2, 26394
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26392"
+#define FB_BUILD_NO "26394"
#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-12-06 03:21:23 UTC (rev 53670)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-06 03:28:01 UTC (rev 53671)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26392
+BuildNum=26394
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-12-07 03:27:48
|
Revision: 53683
http://firebird.svn.sourceforge.net/firebird/?rev=53683&view=rev
Author: firebirds
Date: 2011-12-07 03:27:41 +0000 (Wed, 07 Dec 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-12-07 03:20:58 UTC (rev 53682)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-07 03:27:41 UTC (rev 53683)
@@ -1,3 +1,11 @@
+ 2011-12-06 13:12 dimitr
+ M src/jrd/trig.h
+Fixed CORE-3692: Cannot drop a NOT NULL constraint on a field participating in the UNIQUE constraint.
+
+ 2011-12-06 10:00 dimitr
+ M src/jrd/cmp.cpp
+Fixed CORE-927: Grants don't work for procedures used inside views.
+
2011-12-05 13:52 hvlad
M src/dsql/dsql.cpp
Fixed bug CORE-3680 : EXECUTE BLOCK statement and ISC_DSQL_EXECUTE2() problem
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-07 03:20:58 UTC (rev 53682)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-07 03:27:41 UTC (rev 53683)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26394
+ FORMAL BUILD NUMBER:26396
*/
-#define PRODUCT_VER_STRING "2.5.2.26394"
-#define FILE_VER_STRING "WI-V2.5.2.26394"
-#define LICENSE_VER_STRING "WI-V2.5.2.26394"
-#define FILE_VER_NUMBER 2, 5, 2, 26394
+#define PRODUCT_VER_STRING "2.5.2.26396"
+#define FILE_VER_STRING "WI-V2.5.2.26396"
+#define LICENSE_VER_STRING "WI-V2.5.2.26396"
+#define FILE_VER_NUMBER 2, 5, 2, 26396
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26394"
+#define FB_BUILD_NO "26396"
#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-12-07 03:20:58 UTC (rev 53682)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-07 03:27:41 UTC (rev 53683)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26394
+BuildNum=26396
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-12-11 03:28:13
|
Revision: 53689
http://firebird.svn.sourceforge.net/firebird/?rev=53689&view=rev
Author: firebirds
Date: 2011-12-11 03:28:07 +0000 (Sun, 11 Dec 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-12-11 01:26:03 UTC (rev 53688)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-11 03:28:07 UTC (rev 53689)
@@ -1,3 +1,7 @@
+ 2011-12-11 01:26 asfernandes
+ M src/jrd/blb.cpp
+Backported fix for CORE-3601 - Incorrect TEXT BLOB charset transliteration on VIEW with trigger.
+
2011-12-06 13:12 dimitr
M src/jrd/trig.h
Fixed CORE-3692: Cannot drop a NOT NULL constraint on a field participating in the UNIQUE constraint.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-11 01:26:03 UTC (rev 53688)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-11 03:28:07 UTC (rev 53689)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26396
+ FORMAL BUILD NUMBER:26397
*/
-#define PRODUCT_VER_STRING "2.5.2.26396"
-#define FILE_VER_STRING "WI-V2.5.2.26396"
-#define LICENSE_VER_STRING "WI-V2.5.2.26396"
-#define FILE_VER_NUMBER 2, 5, 2, 26396
+#define PRODUCT_VER_STRING "2.5.2.26397"
+#define FILE_VER_STRING "WI-V2.5.2.26397"
+#define LICENSE_VER_STRING "WI-V2.5.2.26397"
+#define FILE_VER_NUMBER 2, 5, 2, 26397
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26396"
+#define FB_BUILD_NO "26397"
#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-12-11 01:26:03 UTC (rev 53688)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-11 03:28:07 UTC (rev 53689)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26396
+BuildNum=26397
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-12-15 03:28:06
|
Revision: 53698
http://firebird.svn.sourceforge.net/firebird/?rev=53698&view=rev
Author: firebirds
Date: 2011-12-15 03:28:00 +0000 (Thu, 15 Dec 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-12-15 03:21:11 UTC (rev 53697)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-15 03:28:00 UTC (rev 53698)
@@ -1,3 +1,11 @@
+ 2011-12-14 16:08 dimitr
+ M src/dsql/gen.cpp
+Fixed (methinks) CORE-3697: String truncation error when selecting from a VIEW with UNION inside. It doesn't look like a good idea to modify dsc_length in place, as it can be used afterwards (e.g. MAKE_desc(field) after GEN_expr(rse), see define_view() in ddl.cpp). We only need to ensure that the generated BLR has the real byte length and it can be achieved with a temporary descriptor copy. Other solutions are also possible but this one seems better at the first glance.
+
+ 2011-12-14 14:49 paulbeach
+ M builds/install/arch-specific/darwin/preupgrade-script
+CORE-3862 - Multiple update installs can cause problems.
+
2011-12-11 01:26 asfernandes
M src/jrd/blb.cpp
Backported fix for CORE-3601 - Incorrect TEXT BLOB charset transliteration on VIEW with trigger.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-15 03:21:11 UTC (rev 53697)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-15 03:28:00 UTC (rev 53698)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26397
+ FORMAL BUILD NUMBER:26399
*/
-#define PRODUCT_VER_STRING "2.5.2.26397"
-#define FILE_VER_STRING "WI-V2.5.2.26397"
-#define LICENSE_VER_STRING "WI-V2.5.2.26397"
-#define FILE_VER_NUMBER 2, 5, 2, 26397
+#define PRODUCT_VER_STRING "2.5.2.26399"
+#define FILE_VER_STRING "WI-V2.5.2.26399"
+#define LICENSE_VER_STRING "WI-V2.5.2.26399"
+#define FILE_VER_NUMBER 2, 5, 2, 26399
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26397"
+#define FB_BUILD_NO "26399"
#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-12-15 03:21:11 UTC (rev 53697)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-15 03:28:00 UTC (rev 53698)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26397
+BuildNum=26399
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-12-20 03:28:49
|
Revision: 53712
http://firebird.svn.sourceforge.net/firebird/?rev=53712&view=rev
Author: firebirds
Date: 2011-12-20 03:28:42 +0000 (Tue, 20 Dec 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-12-20 03:21:44 UTC (rev 53711)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-20 03:28:42 UTC (rev 53712)
@@ -1,3 +1,14 @@
+ 2011-12-19 16:01 hvlad
+ M src/common/classes/init.cpp
+ M src/jrd/gds.cpp
+ M src/jrd/jrd.cpp
+ M src/jrd/why.cpp
+Fixed bug CORE-3671 : JVM Access Violation when using Firebird Embedded
+
+ 2011-12-19 09:59 dimitr
+ M src/jrd/opt.cpp
+Backported CORE-3683: Wrong results if the recursive query contains an embedded GROUP BY clause.
+
2011-12-14 16:08 dimitr
M src/dsql/gen.cpp
Fixed (methinks) CORE-3697: String truncation error when selecting from a VIEW with UNION inside. It doesn't look like a good idea to modify dsc_length in place, as it can be used afterwards (e.g. MAKE_desc(field) after GEN_expr(rse), see define_view() in ddl.cpp). We only need to ensure that the generated BLR has the real byte length and it can be achieved with a temporary descriptor copy. Other solutions are also possible but this one seems better at the first glance.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-20 03:21:44 UTC (rev 53711)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-20 03:28:42 UTC (rev 53712)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26399
+ FORMAL BUILD NUMBER:26401
*/
-#define PRODUCT_VER_STRING "2.5.2.26399"
-#define FILE_VER_STRING "WI-V2.5.2.26399"
-#define LICENSE_VER_STRING "WI-V2.5.2.26399"
-#define FILE_VER_NUMBER 2, 5, 2, 26399
+#define PRODUCT_VER_STRING "2.5.2.26401"
+#define FILE_VER_STRING "WI-V2.5.2.26401"
+#define LICENSE_VER_STRING "WI-V2.5.2.26401"
+#define FILE_VER_NUMBER 2, 5, 2, 26401
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26399"
+#define FB_BUILD_NO "26401"
#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-12-20 03:21:44 UTC (rev 53711)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-20 03:28:42 UTC (rev 53712)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26399
+BuildNum=26401
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-12-21 03:28:53
|
Revision: 53720
http://firebird.svn.sourceforge.net/firebird/?rev=53720&view=rev
Author: firebirds
Date: 2011-12-21 03:28:47 +0000 (Wed, 21 Dec 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-12-21 03:21:59 UTC (rev 53719)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-21 03:28:47 UTC (rev 53720)
@@ -1,3 +1,7 @@
+ 2011-12-20 12:11 hvlad
+ M src/jrd/jrd.cpp
+POSIX related correction for CORE-3671, thanks to Alex
+
2011-12-19 16:01 hvlad
M src/common/classes/init.cpp
M src/jrd/gds.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-21 03:21:59 UTC (rev 53719)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-21 03:28:47 UTC (rev 53720)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26401
+ FORMAL BUILD NUMBER:26402
*/
-#define PRODUCT_VER_STRING "2.5.2.26401"
-#define FILE_VER_STRING "WI-V2.5.2.26401"
-#define LICENSE_VER_STRING "WI-V2.5.2.26401"
-#define FILE_VER_NUMBER 2, 5, 2, 26401
+#define PRODUCT_VER_STRING "2.5.2.26402"
+#define FILE_VER_STRING "WI-V2.5.2.26402"
+#define LICENSE_VER_STRING "WI-V2.5.2.26402"
+#define FILE_VER_NUMBER 2, 5, 2, 26402
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26401"
+#define FB_BUILD_NO "26402"
#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-12-21 03:21:59 UTC (rev 53719)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-21 03:28:47 UTC (rev 53720)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26401
+BuildNum=26402
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-12-21 14:45:50
|
Revision: 53728
http://firebird.svn.sourceforge.net/firebird/?rev=53728&view=rev
Author: asfernandes
Date: 2011-12-21 14:45:39 +0000 (Wed, 21 Dec 2011)
Log Message:
-----------
Backport CORE-3238 - Make GEN_UUID return a compliant RFC-4122 binary UUID and introduce CHAR_TO_UUID2 and UUID_TO_CHAR2 to convert UUIDs from/to string also complying with the RFC.
Modified Paths:
--------------
firebird/branches/B2_5_Release/builds/make.new/config/install-sh
firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt
firebird/branches/B2_5_Release/src/dsql/keywords.cpp
firebird/branches/B2_5_Release/src/dsql/parse.y
firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp
firebird/branches/B2_5_Release/src/jrd/os/guid.h
firebird/branches/B2_5_Release/src/jrd/os/posix/guid.cpp
Property Changed:
----------------
firebird/branches/B2_5_Release/builds/make.new/config/install-sh
Property changes on: firebird/branches/B2_5_Release/builds/make.new/config/install-sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt
===================================================================
--- firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt 2011-12-21 10:57:15 UTC (rev 53727)
+++ firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt 2011-12-21 14:45:39 UTC (rev 53728)
@@ -246,12 +246,38 @@
Format:
CHAR_TO_UUID( <string> )
+Notes:
+ If you have not used this function before, its usage is discouraged. CHAR_TO_UUID2 superseds it.
+
Example:
select char_to_uuid('93519227-8D50-4E47-81AA-8F6678C096A1') from rdb$database;
-See also: GEN_UUID and UUID_TO_CHAR
+See also: GEN_UUID, CHAR_TO_UUID2, UUID_TO_CHAR and UUID_TO_CHAR2
+-------------
+CHAR_TO_UUID2
+-------------
+
+Function:
+ Converts the CHAR(32) ASCII representation of an UUID
+ (XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX) to the CHAR(16) OCTETS
+ representation (optimized for storage).
+
+Format:
+ CHAR_TO_UUID2( <string> )
+
+Notes:
+ This function superseds CHAR_TO_UUID. The difference between them is that CHAR_TO_UUID does a
+ byte-by-byte conversion of the ASCII string to the OCTETS one, while CHAR_TO_UUID2 converts
+ a RFC-4122 compliant ASCII UUID to a compliant OCTETS string.
+
+Example:
+ select char_to_uuid2('93519227-8D50-4E47-81AA-8F6678C096A1') from rdb$database;
+
+See also: GEN_UUID, UUID_TO_CHAR2
+
+
---
COS
---
@@ -405,10 +431,17 @@
Format:
GEN_UUID()
+Notes:
+ In Firebird 2.5.0 and 2.5.1, GEN_UUID was returning completely random strings. This is not
+ compliant with the RFC-4122 (UUID specification).
+ In Firebird 2.5.2 and 3.0 this was fixed. Now GEN_UUID returns a compliant UUID version 4
+ string, where some bits are reserved and the others are random. The string format of a compliant
+ UUID is XXXXXXXX-XXXX-4XXX-YXXX-XXXXXXXXXXXX, where 4 is fixed (version) and Y is 8, 9, A or B.
+
Example:
insert into records (id) value (gen_uuid());
-See also: CHAR_TO_UUID and UUID_TO_CHAR
+See also: CHAR_TO_UUID, UUID_TO_CHAR, CHAR_TO_UUID2, UUID_TO_CHAR2
----
@@ -836,7 +869,32 @@
Format:
UUID_TO_CHAR( <string> )
+Notes:
+ If you have not used this function before, its usage is discouraged. UUID_TO_CHAR2 superseds it.
+
Example:
select uuid_to_char(gen_uuid()) from rdb$database;
-See also: GEN_UUID and CHAR_TO_UUID
+See also: GEN_UUID, UUID_TO_CHAR2, CHAR_TO_UUID and CHAR_TO_UUID2
+
+
+-------------
+UUID_TO_CHAR2
+-------------
+
+Function:
+ Converts a CHAR(16) OCTETS UUID (that's returned by GEN_UUID) to the
+ CHAR(32) ASCII representation (XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX).
+
+Format:
+ UUID_TO_CHAR2( <string> )
+
+Notes:
+ This function superseds UUID_TO_CHAR. The difference between them is that UUID_TO_CHAR does a
+ byte-by-byte conversion of the OCTETS string to the ASCII one, while UUID_TO_CHAR2 converts
+ a RFC-4122 compliant OCTETS UUID to a compliant ASCII string.
+
+Example:
+ select uuid_to_char2(gen_uuid()) from rdb$database;
+
+See also: GEN_UUID, CHAR_TO_UUID2
Modified: firebird/branches/B2_5_Release/src/dsql/keywords.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/dsql/keywords.cpp 2011-12-21 10:57:15 UTC (rev 53727)
+++ firebird/branches/B2_5_Release/src/dsql/keywords.cpp 2011-12-21 14:45:39 UTC (rev 53728)
@@ -104,6 +104,7 @@
{KW_CHAR, "CHAR", 1, false},
{CHAR_LENGTH, "CHAR_LENGTH", 2, false},
{CHAR_TO_UUID, "CHAR_TO_UUID", 2, false},
+ {CHAR_TO_UUID2, "CHAR_TO_UUID2", 2, false},
{CHARACTER, "CHARACTER", 1, false},
{CHARACTER_LENGTH, "CHARACTER_LENGTH", 2, false},
{CHECK, "CHECK", 1, false},
@@ -383,6 +384,7 @@
{USER, "USER", 1, false},
{USING, "USING", 2, false},
{UUID_TO_CHAR, "UUID_TO_CHAR", 2, false},
+ {UUID_TO_CHAR2, "UUID_TO_CHAR2", 2, false},
{KW_VALUE, "VALUE", 1, false},
{VALUES, "VALUES", 1, false},
{VARCHAR, "VARCHAR", 1, false},
Modified: firebird/branches/B2_5_Release/src/dsql/parse.y
===================================================================
--- firebird/branches/B2_5_Release/src/dsql/parse.y 2011-12-21 10:57:15 UTC (rev 53727)
+++ firebird/branches/B2_5_Release/src/dsql/parse.y 2011-12-21 14:45:39 UTC (rev 53728)
@@ -543,6 +543,7 @@
%token AUTONOMOUS
%token CHAR_TO_UUID
+%token CHAR_TO_UUID2
%token FIRSTNAME
%token GRANTED
%token LASTNAME
@@ -551,6 +552,7 @@
%token OS_NAME
%token SIMILAR
%token UUID_TO_CHAR
+%token UUID_TO_CHAR2
%token DUMP
@@ -4639,6 +4641,7 @@
| BIN_XOR
| CEIL
| CHAR_TO_UUID
+ | CHAR_TO_UUID2
| COS
| COSH
| COT
@@ -4671,6 +4674,7 @@
| TANH
| TRUNC
| UUID_TO_CHAR
+ | UUID_TO_CHAR2
;
system_function_special_syntax
@@ -5073,12 +5077,14 @@
| WEEK
| AUTONOMOUS // added in FB 2.5
| CHAR_TO_UUID
+ | CHAR_TO_UUID2
| FIRSTNAME
| MIDDLENAME
| LASTNAME
| MAPPING
| OS_NAME
| UUID_TO_CHAR
+ | UUID_TO_CHAR2
| GRANTED
| CALLER // new execute statement
| COMMON
Modified: firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp 2011-12-21 10:57:15 UTC (rev 53727)
+++ firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp 2011-12-21 14:45:39 UTC (rev 53728)
@@ -68,7 +68,9 @@
funLPad,
funRPad,
funLnat,
- funLog10
+ funLog10,
+ funUuidBroken,
+ funUuidRfc
};
enum TrigonFunction
@@ -1432,8 +1434,37 @@
memcpy(buffer + 1, data, GUID_BODY_SIZE);
FB_GUID guid;
- StringToGuid(&guid, buffer, false);
+ switch ((Function)(IPTR) function->misc)
+ {
+ case funUuidBroken:
+ StringToGuid(&guid, buffer, false);
+ break;
+
+ case funUuidRfc:
+ {
+ USHORT bytes[16];
+ sscanf(buffer, GUID_NEW_FORMAT,
+ &bytes[0], &bytes[1], &bytes[2], &bytes[3],
+ &bytes[4], &bytes[5], &bytes[6], &bytes[7],
+ &bytes[8], &bytes[9], &bytes[10], &bytes[11],
+ &bytes[12], &bytes[13], &bytes[14], &bytes[15]);
+
+ guid.data1 = (bytes[0] << 24) | (bytes[1] << 16) | (bytes[2] << 8) | bytes[3];
+ guid.data2 = (bytes[4] << 8) | bytes[5];
+ guid.data3 = (bytes[6] << 8) | bytes[7];
+ guid.data4[0] = bytes[8];
+ guid.data4[1] = bytes[9];
+ guid.data4[2] = bytes[10];
+ guid.data4[3] = bytes[11];
+ guid.data4[4] = bytes[12];
+ guid.data4[5] = bytes[13];
+ guid.data4[6] = bytes[14];
+ guid.data4[7] = bytes[15];
+ break;
+ }
+ }
+
dsc result;
result.makeText(16, ttype_binary, reinterpret_cast<UCHAR*>(guid.data));
EVL_make_value(tdbb, &result, impure);
@@ -3288,9 +3319,28 @@
Arg::Str(function->name));
}
+ const const FB_GUID* guid = reinterpret_cast<const FB_GUID*>(data);
char buffer[GUID_BUFF_SIZE];
- GuidToString(buffer, reinterpret_cast<const FB_GUID*>(data), false);
+ switch ((Function)(IPTR) function->misc)
+ {
+ case funUuidBroken:
+ GuidToString(buffer, guid, false);
+ break;
+
+ case funUuidRfc:
+ sprintf(buffer, GUID_NEW_FORMAT,
+ USHORT((guid->data1 >> 24) & 0xFF), USHORT((guid->data1 >> 16) & 0xFF),
+ USHORT((guid->data1 >> 8) & 0xFF), USHORT(guid->data1 & 0xFF),
+ USHORT((guid->data2 >> 8) & 0xFF), USHORT(guid->data2 & 0xFF),
+ USHORT((guid->data3 >> 8) & 0xFF), USHORT(guid->data3 & 0xFF),
+ USHORT(guid->data4[0]), USHORT(guid->data4[1]),
+ USHORT(guid->data4[2]), USHORT(guid->data4[3]),
+ USHORT(guid->data4[4]), USHORT(guid->data4[5]),
+ USHORT(guid->data4[6]), USHORT(guid->data4[7]));
+ break;
+ }
+
dsc result;
result.makeText(GUID_BODY_SIZE, ttype_ascii, reinterpret_cast<UCHAR*>(buffer) + 1);
EVL_make_value(tdbb, &result, impure);
@@ -3324,7 +3374,8 @@
{"BIN_XOR", 2, -1, setParamsInteger, makeBin, evlBin, (void*) funBinXor},
{"CEIL", 1, 1, setParamsDouble, makeCeilFloor, evlCeil, NULL},
{"CEILING", 1, 1, setParamsDouble, makeCeilFloor, evlCeil, NULL},
- {"CHAR_TO_UUID", 1, 1, setParamsCharToUuid, makeUuid, evlCharToUuid, NULL},
+ {"CHAR_TO_UUID", 1, 1, setParamsCharToUuid, makeUuid, evlCharToUuid, (void*) funUuidBroken},
+ {"CHAR_TO_UUID2", 1, 1, setParamsCharToUuid, makeUuid, evlCharToUuid, (void*) funUuidRfc},
{"COS", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (void*) trfCos},
{"COSH", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (void*) trfCosh},
{"COT", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (void*) trfCot},
@@ -3359,7 +3410,8 @@
{"TAN", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (void*) trfTan},
{"TANH", 1, 1, setParamsDouble, makeDoubleResult, evlStdMath, (void*) trfTanh},
{"TRUNC", 1, 2, setParamsRoundTrunc, makeTrunc, evlTrunc, NULL},
- {"UUID_TO_CHAR", 1, 1, setParamsUuidToChar, makeUuidToChar, evlUuidToChar, NULL},
+ {"UUID_TO_CHAR", 1, 1, setParamsUuidToChar, makeUuidToChar, evlUuidToChar, (void*) funUuidBroken},
+ {"UUID_TO_CHAR2", 1, 1, setParamsUuidToChar, makeUuidToChar, evlUuidToChar, (void*) funUuidRfc},
{"", 0, 0, NULL, NULL, NULL, NULL}
};
Modified: firebird/branches/B2_5_Release/src/jrd/os/guid.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/os/guid.h 2011-12-21 10:57:15 UTC (rev 53727)
+++ firebird/branches/B2_5_Release/src/jrd/os/guid.h 2011-12-21 14:45:39 UTC (rev 53728)
@@ -44,7 +44,18 @@
struct FB_GUID
{
- USHORT data[8];
+ union
+ {
+ USHORT data[8];
+
+ struct // Compatible with Win32 GUID struct layout.
+ {
+ ULONG data1;
+ USHORT data2;
+ USHORT data3;
+ UCHAR data4[8];
+ };
+ };
};
void GenerateRandomBytes(void* buffer, size_t size);
@@ -63,14 +74,14 @@
else
{
sprintf(buffer, GUID_NEW_FORMAT,
- guid->data[0] & 0xFF, guid->data[0] >> 8,
- guid->data[1] & 0xFF, guid->data[1] >> 8,
- guid->data[2] & 0xFF, guid->data[2] >> 8,
- guid->data[3] & 0xFF, guid->data[3] >> 8,
- guid->data[4] & 0xFF, guid->data[4] >> 8,
- guid->data[5] & 0xFF, guid->data[5] >> 8,
- guid->data[6] & 0xFF, guid->data[6] >> 8,
- guid->data[7] & 0xFF, guid->data[7] >> 8);
+ USHORT(guid->data[0] & 0xFF), USHORT(guid->data[0] >> 8),
+ USHORT(guid->data[1] & 0xFF), USHORT(guid->data[1] >> 8),
+ USHORT(guid->data[2] & 0xFF), USHORT(guid->data[2] >> 8),
+ USHORT(guid->data[3] & 0xFF), USHORT(guid->data[3] >> 8),
+ USHORT(guid->data[4] & 0xFF), USHORT(guid->data[4] >> 8),
+ USHORT(guid->data[5] & 0xFF), USHORT(guid->data[5] >> 8),
+ USHORT(guid->data[6] & 0xFF), USHORT(guid->data[6] >> 8),
+ USHORT(guid->data[7] & 0xFF), USHORT(guid->data[7] >> 8));
}
}
Modified: firebird/branches/B2_5_Release/src/jrd/os/posix/guid.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/os/posix/guid.cpp 2011-12-21 10:57:15 UTC (rev 53727)
+++ firebird/branches/B2_5_Release/src/jrd/os/posix/guid.cpp 2011-12-21 14:45:39 UTC (rev 53728)
@@ -70,4 +70,6 @@
void GenerateGuid(FB_GUID* guid)
{
GenerateRandomBytes(guid, sizeof(FB_GUID));
+ guid->data3 = (4 << 12) | (guid->data3 & 0xFFF); // version 4
+ guid->data4[0] = 0x80 | (guid->data4[0] & 0x3F); // variant
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-12-22 03:30:03
|
Revision: 53734
http://firebird.svn.sourceforge.net/firebird/?rev=53734&view=rev
Author: firebirds
Date: 2011-12-22 03:29:56 +0000 (Thu, 22 Dec 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-12-21 15:54:59 UTC (rev 53733)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-22 03:29:56 UTC (rev 53734)
@@ -1,3 +1,13 @@
+ 2011-12-21 14:45 asfernandes
+ M builds/make.new/config/install-sh
+ M doc/sql.extensions/README.builtin_functions.txt
+ M src/dsql/keywords.cpp
+ M src/dsql/parse.y
+ M src/jrd/SysFunction.cpp
+ M src/jrd/os/guid.h
+ M src/jrd/os/posix/guid.cpp
+Backport CORE-3238 - Make GEN_UUID return a compliant RFC-4122 binary UUID and introduce CHAR_TO_UUID2 and UUID_TO_CHAR2 to convert UUIDs from/to string also complying with the RFC.
+
2011-12-20 12:11 hvlad
M src/jrd/jrd.cpp
POSIX related correction for CORE-3671, thanks to Alex
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-21 15:54:59 UTC (rev 53733)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-22 03:29:56 UTC (rev 53734)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26402
+ FORMAL BUILD NUMBER:26403
*/
-#define PRODUCT_VER_STRING "2.5.2.26402"
-#define FILE_VER_STRING "WI-V2.5.2.26402"
-#define LICENSE_VER_STRING "WI-V2.5.2.26402"
-#define FILE_VER_NUMBER 2, 5, 2, 26402
+#define PRODUCT_VER_STRING "2.5.2.26403"
+#define FILE_VER_STRING "WI-V2.5.2.26403"
+#define LICENSE_VER_STRING "WI-V2.5.2.26403"
+#define FILE_VER_NUMBER 2, 5, 2, 26403
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26402"
+#define FB_BUILD_NO "26403"
#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-12-21 15:54:59 UTC (rev 53733)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-22 03:29:56 UTC (rev 53734)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26402
+BuildNum=26403
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-12-25 03:26:21
|
Revision: 53754
http://firebird.svn.sourceforge.net/firebird/?rev=53754&view=rev
Author: firebirds
Date: 2011-12-25 03:26:14 +0000 (Sun, 25 Dec 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-12-25 03:19:23 UTC (rev 53753)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-25 03:26:14 UTC (rev 53754)
@@ -1,3 +1,7 @@
+ 2011-12-24 18:21 asfernandes
+ M doc/sql.extensions/README.builtin_functions.txt
+Fix - thanks Paul Vinkenoog.
+
2011-12-21 14:45 asfernandes
M builds/make.new/config/install-sh
M doc/sql.extensions/README.builtin_functions.txt
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-25 03:19:23 UTC (rev 53753)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-25 03:26:14 UTC (rev 53754)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26403
+ FORMAL BUILD NUMBER:26404
*/
-#define PRODUCT_VER_STRING "2.5.2.26403"
-#define FILE_VER_STRING "WI-V2.5.2.26403"
-#define LICENSE_VER_STRING "WI-V2.5.2.26403"
-#define FILE_VER_NUMBER 2, 5, 2, 26403
+#define PRODUCT_VER_STRING "2.5.2.26404"
+#define FILE_VER_STRING "WI-V2.5.2.26404"
+#define LICENSE_VER_STRING "WI-V2.5.2.26404"
+#define FILE_VER_NUMBER 2, 5, 2, 26404
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26403"
+#define FB_BUILD_NO "26404"
#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-12-25 03:19:23 UTC (rev 53753)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-25 03:26:14 UTC (rev 53754)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26403
+BuildNum=26404
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-12-27 03:33:06
|
Revision: 53775
http://firebird.svn.sourceforge.net/firebird/?rev=53775&view=rev
Author: firebirds
Date: 2011-12-27 03:32:59 +0000 (Tue, 27 Dec 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-12-27 03:21:31 UTC (rev 53774)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-27 03:32:59 UTC (rev 53775)
@@ -1,3 +1,7 @@
+ 2011-12-26 17:11 alexpeshkoff
+ M src/jrd/SysFunction.cpp
+misc
+
2011-12-24 18:21 asfernandes
M doc/sql.extensions/README.builtin_functions.txt
Fix - thanks Paul Vinkenoog.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-27 03:21:31 UTC (rev 53774)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-27 03:32:59 UTC (rev 53775)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26404
+ FORMAL BUILD NUMBER:26405
*/
-#define PRODUCT_VER_STRING "2.5.2.26404"
-#define FILE_VER_STRING "WI-V2.5.2.26404"
-#define LICENSE_VER_STRING "WI-V2.5.2.26404"
-#define FILE_VER_NUMBER 2, 5, 2, 26404
+#define PRODUCT_VER_STRING "2.5.2.26405"
+#define FILE_VER_STRING "WI-V2.5.2.26405"
+#define LICENSE_VER_STRING "WI-V2.5.2.26405"
+#define FILE_VER_NUMBER 2, 5, 2, 26405
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26404"
+#define FB_BUILD_NO "26405"
#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-12-27 03:21:31 UTC (rev 53774)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-27 03:32:59 UTC (rev 53775)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26404
+BuildNum=26405
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-12-28 03:28:04
|
Revision: 53781
http://firebird.svn.sourceforge.net/firebird/?rev=53781&view=rev
Author: firebirds
Date: 2011-12-28 03:27:57 +0000 (Wed, 28 Dec 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-12-28 03:21:12 UTC (rev 53780)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-28 03:27:57 UTC (rev 53781)
@@ -1,3 +1,26 @@
+ 2011-12-27 12:45 alexpeshkoff
+ M builds/posix/Makefile.in.client.gbak
+ M builds/posix/Makefile.in.client.gdef
+ M builds/posix/Makefile.in.client.gfix
+ M builds/posix/Makefile.in.client.gpre
+ M builds/posix/Makefile.in.client.gsec
+ M builds/posix/Makefile.in.client.isql
+ M builds/posix/Makefile.in.client.qli
+ M builds/posix/Makefile.in.client.util
+ M builds/posix/Makefile.in.embed.gbak
+ M builds/posix/Makefile.in.embed.gdef
+ M builds/posix/Makefile.in.embed.gfix
+ M builds/posix/Makefile.in.embed.gpre
+ M builds/posix/Makefile.in.embed.isql
+ M builds/posix/Makefile.in.embed.qli
+ M builds/posix/Makefile.in.embed.util
+ M builds/posix/Makefile.in.fbserver
+ M builds/posix/Makefile.in.inet_server
+ M builds/posix/Makefile.in.smp_server
+ A builds/posix/empty.vers
+ M builds/posix/make.defaults
+Backported fix for CORE-3677: Stop utilities to export entrypoints
+
2011-12-26 17:11 alexpeshkoff
M src/jrd/SysFunction.cpp
misc
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-28 03:21:12 UTC (rev 53780)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-28 03:27:57 UTC (rev 53781)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26405
+ FORMAL BUILD NUMBER:26406
*/
-#define PRODUCT_VER_STRING "2.5.2.26405"
-#define FILE_VER_STRING "WI-V2.5.2.26405"
-#define LICENSE_VER_STRING "WI-V2.5.2.26405"
-#define FILE_VER_NUMBER 2, 5, 2, 26405
+#define PRODUCT_VER_STRING "2.5.2.26406"
+#define FILE_VER_STRING "WI-V2.5.2.26406"
+#define LICENSE_VER_STRING "WI-V2.5.2.26406"
+#define FILE_VER_NUMBER 2, 5, 2, 26406
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26405"
+#define FB_BUILD_NO "26406"
#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-12-28 03:21:12 UTC (rev 53780)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-28 03:27:57 UTC (rev 53781)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26405
+BuildNum=26406
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-12-29 03:30:02
|
Revision: 53790
http://firebird.svn.sourceforge.net/firebird/?rev=53790&view=rev
Author: firebirds
Date: 2011-12-29 03:29:55 +0000 (Thu, 29 Dec 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-12-29 03:23:07 UTC (rev 53789)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-29 03:29:55 UTC (rev 53790)
@@ -1,3 +1,8 @@
+ 2011-12-28 18:12 dimitr
+ M src/remote/inet.cpp
+ M src/remote/interface.cpp
+Misc.
+
2011-12-27 12:45 alexpeshkoff
M builds/posix/Makefile.in.client.gbak
M builds/posix/Makefile.in.client.gdef
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-29 03:23:07 UTC (rev 53789)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-29 03:29:55 UTC (rev 53790)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26406
+ FORMAL BUILD NUMBER:26407
*/
-#define PRODUCT_VER_STRING "2.5.2.26406"
-#define FILE_VER_STRING "WI-V2.5.2.26406"
-#define LICENSE_VER_STRING "WI-V2.5.2.26406"
-#define FILE_VER_NUMBER 2, 5, 2, 26406
+#define PRODUCT_VER_STRING "2.5.2.26407"
+#define FILE_VER_STRING "WI-V2.5.2.26407"
+#define LICENSE_VER_STRING "WI-V2.5.2.26407"
+#define FILE_VER_NUMBER 2, 5, 2, 26407
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26406"
+#define FB_BUILD_NO "26407"
#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-12-29 03:23:07 UTC (rev 53789)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-29 03:29:55 UTC (rev 53790)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26406
+BuildNum=26407
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-12-30 03:26:47
|
Revision: 53795
http://firebird.svn.sourceforge.net/firebird/?rev=53795&view=rev
Author: firebirds
Date: 2011-12-30 03:26:40 +0000 (Fri, 30 Dec 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-12-30 03:19:57 UTC (rev 53794)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-30 03:26:40 UTC (rev 53795)
@@ -1,3 +1,15 @@
+ 2011-12-29 16:11 alexpeshkoff
+ M src/common/fb_exception.cpp
+ M src/include/fb_exception.h
+ M src/jrd/ibsetjmp.h
+ M src/jrd/isc_s_proto.h
+ M src/jrd/isc_sync.cpp
+Fixed CORE-3646: Segmentation fault in Linux
+
+ 2011-12-29 16:09 alexpeshkoff
+ M src/jrd/os/posix/mod_loader.cpp
+misc
+
2011-12-28 18:12 dimitr
M src/remote/inet.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-12-30 03:19:57 UTC (rev 53794)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-30 03:26:40 UTC (rev 53795)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26407
+ FORMAL BUILD NUMBER:26409
*/
-#define PRODUCT_VER_STRING "2.5.2.26407"
-#define FILE_VER_STRING "WI-V2.5.2.26407"
-#define LICENSE_VER_STRING "WI-V2.5.2.26407"
-#define FILE_VER_NUMBER 2, 5, 2, 26407
+#define PRODUCT_VER_STRING "2.5.2.26409"
+#define FILE_VER_STRING "WI-V2.5.2.26409"
+#define LICENSE_VER_STRING "WI-V2.5.2.26409"
+#define FILE_VER_NUMBER 2, 5, 2, 26409
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26407"
+#define FB_BUILD_NO "26409"
#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-12-30 03:19:57 UTC (rev 53794)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-30 03:26:40 UTC (rev 53795)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26407
+BuildNum=26409
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-12-30 14:46:47
|
Revision: 53800
http://firebird.svn.sourceforge.net/firebird/?rev=53800&view=rev
Author: asfernandes
Date: 2011-12-30 14:46:41 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
Make UUID_TO_CHAR2 returns lower-cased strings, as the RFC specifies.
Modified Paths:
--------------
firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt
firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp
firebird/branches/B2_5_Release/src/jrd/os/guid.h
Modified: firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt
===================================================================
--- firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt 2011-12-30 14:38:03 UTC (rev 53799)
+++ firebird/branches/B2_5_Release/doc/sql.extensions/README.builtin_functions.txt 2011-12-30 14:46:41 UTC (rev 53800)
@@ -261,7 +261,7 @@
Function:
Converts the CHAR(32) ASCII representation of an UUID
- (XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX) to the CHAR(16) OCTETS
+ (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx) to the CHAR(16) OCTETS
representation (optimized for storage).
Format:
@@ -884,7 +884,7 @@
Function:
Converts a CHAR(16) OCTETS UUID (that's returned by GEN_UUID) to the
- CHAR(32) ASCII representation (XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX).
+ CHAR(32) ASCII representation (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).
Format:
UUID_TO_CHAR2( <string> )
@@ -892,7 +892,8 @@
Notes:
This function supersedes UUID_TO_CHAR. The difference between them is that UUID_TO_CHAR does a
byte-by-byte conversion of the OCTETS string to the ASCII one, while UUID_TO_CHAR2 converts
- a RFC-4122 compliant OCTETS UUID to a compliant ASCII string.
+ a RFC-4122 compliant OCTETS UUID to a compliant ASCII string. Also, UUID_TO_CHAR returns
+ upper-cased string and UUID_TO_CHAR2 returns lower-cased string.
Example:
select uuid_to_char2(gen_uuid()) from rdb$database;
Modified: firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp 2011-12-30 14:38:03 UTC (rev 53799)
+++ firebird/branches/B2_5_Release/src/jrd/SysFunction.cpp 2011-12-30 14:46:41 UTC (rev 53800)
@@ -1444,7 +1444,7 @@
case funUuidRfc:
{
USHORT bytes[16];
- sscanf(buffer, GUID_NEW_FORMAT,
+ sscanf(buffer, GUID_NEW_FORMAT_LOWER,
&bytes[0], &bytes[1], &bytes[2], &bytes[3],
&bytes[4], &bytes[5], &bytes[6], &bytes[7],
&bytes[8], &bytes[9], &bytes[10], &bytes[11],
@@ -3329,7 +3329,7 @@
break;
case funUuidRfc:
- sprintf(buffer, GUID_NEW_FORMAT,
+ sprintf(buffer, GUID_NEW_FORMAT_LOWER,
USHORT((guid->data1 >> 24) & 0xFF), USHORT((guid->data1 >> 16) & 0xFF),
USHORT((guid->data1 >> 8) & 0xFF), USHORT(guid->data1 & 0xFF),
USHORT((guid->data2 >> 8) & 0xFF), USHORT(guid->data2 & 0xFF),
Modified: firebird/branches/B2_5_Release/src/jrd/os/guid.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/os/guid.h 2011-12-30 14:38:03 UTC (rev 53799)
+++ firebird/branches/B2_5_Release/src/jrd/os/guid.h 2011-12-30 14:46:41 UTC (rev 53800)
@@ -39,8 +39,10 @@
const char* const GUID_LEGACY_FORMAT =
"{%04hX%04hX-%04hX-%04hX-%04hX-%04hX%04hX%04hX}";
-const char* const GUID_NEW_FORMAT =
+const char* const GUID_NEW_FORMAT_UPPER =
"{%02hX%02hX%02hX%02hX-%02hX%02hX-%02hX%02hX-%02hX%02hX-%02hX%02hX%02hX%02hX%02hX%02hX}";
+const char* const GUID_NEW_FORMAT_LOWER =
+ "{%02hx%02hx%02hx%02hx-%02hx%02hx-%02hx%02hx-%02hx%02hx-%02hx%02hx%02hx%02hx%02hx%02hx}";
struct FB_GUID
{
@@ -73,7 +75,7 @@
}
else
{
- sprintf(buffer, GUID_NEW_FORMAT,
+ sprintf(buffer, GUID_NEW_FORMAT_UPPER,
USHORT(guid->data[0] & 0xFF), USHORT(guid->data[0] >> 8),
USHORT(guid->data[1] & 0xFF), USHORT(guid->data[1] >> 8),
USHORT(guid->data[2] & 0xFF), USHORT(guid->data[2] >> 8),
@@ -96,7 +98,7 @@
else
{
USHORT bytes[16];
- sscanf(buffer, GUID_NEW_FORMAT,
+ sscanf(buffer, GUID_NEW_FORMAT_UPPER,
&bytes[0], &bytes[1], &bytes[2], &bytes[3],
&bytes[4], &bytes[5], &bytes[6], &bytes[7],
&bytes[8], &bytes[9], &bytes[10], &bytes[11],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2011-12-31 03:34:47
|
Revision: 53802
http://firebird.svn.sourceforge.net/firebird/?rev=53802&view=rev
Author: firebirds
Date: 2011-12-31 03:34:40 +0000 (Sat, 31 Dec 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-12-31 03:21:54 UTC (rev 53801)
+++ firebird/branches/B2_5_Release/ChangeLog 2011-12-31 03:34:40 UTC (rev 53802)
@@ -1,3 +1,13 @@
+ 2011-12-30 14:46 asfernandes
+ M doc/sql.extensions/README.builtin_functions.txt
+ M src/jrd/SysFunction.cpp
+ M src/jrd/os/guid.h
+Make UUID_TO_CHAR2 returns lower-cased strings, as the RFC specifies.
+
+ 2011-12-30 14:12 alexpeshkoff
+ M src/utilities/fbsvcmgr.cpp
+Backported fix for CORE-3658: FBSVCMGR connects to server as OS user name rather than value of ISC_USER environment variable
+
2011-12-29 16:11 alexpeshkoff
M src/common/fb_exception.cpp
M src/include/fb_exception.h
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-31 03:21:54 UTC (rev 53801)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2011-12-31 03:34:40 UTC (rev 53802)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26409
+ FORMAL BUILD NUMBER:26411
*/
-#define PRODUCT_VER_STRING "2.5.2.26409"
-#define FILE_VER_STRING "WI-V2.5.2.26409"
-#define LICENSE_VER_STRING "WI-V2.5.2.26409"
-#define FILE_VER_NUMBER 2, 5, 2, 26409
+#define PRODUCT_VER_STRING "2.5.2.26411"
+#define FILE_VER_STRING "WI-V2.5.2.26411"
+#define LICENSE_VER_STRING "WI-V2.5.2.26411"
+#define FILE_VER_NUMBER 2, 5, 2, 26411
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26409"
+#define FB_BUILD_NO "26411"
#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-12-31 03:21:54 UTC (rev 53801)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2011-12-31 03:34:40 UTC (rev 53802)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26409
+BuildNum=26411
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...> - 2012-01-10 03:29:23
|
Revision: 53831
http://firebird.svn.sourceforge.net/firebird/?rev=53831&view=rev
Author: firebirds
Date: 2012-01-10 03:29:17 +0000 (Tue, 10 Jan 2012)
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 2012-01-10 03:21:48 UTC (rev 53830)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-01-10 03:29:17 UTC (rev 53831)
@@ -1,3 +1,11 @@
+ 2012-01-09 08:56 dimitr
+ M src/jrd/idx.h
+One more index to avoid full table scans on system tables (this time during the column modification).
+
+ 2012-01-09 08:27 dimitr
+ M src/jrd/idx.h
+Added a system index that helps to avoid a full table scan on RDB$PROCEDURE_PARAMETERS during domain deletion.
+
2011-12-30 14:46 asfernandes
M doc/sql.extensions/README.builtin_functions.txt
M src/jrd/SysFunction.cpp
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-01-10 03:21:48 UTC (rev 53830)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-01-10 03:29:17 UTC (rev 53831)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26411
+ FORMAL BUILD NUMBER:26413
*/
-#define PRODUCT_VER_STRING "2.5.2.26411"
-#define FILE_VER_STRING "WI-V2.5.2.26411"
-#define LICENSE_VER_STRING "WI-V2.5.2.26411"
-#define FILE_VER_NUMBER 2, 5, 2, 26411
+#define PRODUCT_VER_STRING "2.5.2.26413"
+#define FILE_VER_STRING "WI-V2.5.2.26413"
+#define LICENSE_VER_STRING "WI-V2.5.2.26413"
+#define FILE_VER_NUMBER 2, 5, 2, 26413
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26411"
+#define FB_BUILD_NO "26413"
#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 2012-01-10 03:21:48 UTC (rev 53830)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-01-10 03:29:17 UTC (rev 53831)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26411
+BuildNum=26413
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...> - 2012-01-11 03:32:38
|
Revision: 53838
http://firebird.svn.sourceforge.net/firebird/?rev=53838&view=rev
Author: firebirds
Date: 2012-01-11 03:32:31 +0000 (Wed, 11 Jan 2012)
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 2012-01-11 03:23:28 UTC (rev 53837)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-01-11 03:32:31 UTC (rev 53838)
@@ -1,3 +1,7 @@
+ 2012-01-10 05:27 dimitr
+ M src/jrd/Optimizer.cpp
+The simplest possible fix for CORE-3722: IS NOT DISTINCT FROM NULL doesn't use index.
+
2012-01-09 08:56 dimitr
M src/jrd/idx.h
One more index to avoid full table scans on system tables (this time during the column modification).
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-01-11 03:23:28 UTC (rev 53837)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-01-11 03:32:31 UTC (rev 53838)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26413
+ FORMAL BUILD NUMBER:26414
*/
-#define PRODUCT_VER_STRING "2.5.2.26413"
-#define FILE_VER_STRING "WI-V2.5.2.26413"
-#define LICENSE_VER_STRING "WI-V2.5.2.26413"
-#define FILE_VER_NUMBER 2, 5, 2, 26413
+#define PRODUCT_VER_STRING "2.5.2.26414"
+#define FILE_VER_STRING "WI-V2.5.2.26414"
+#define LICENSE_VER_STRING "WI-V2.5.2.26414"
+#define FILE_VER_NUMBER 2, 5, 2, 26414
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26413"
+#define FB_BUILD_NO "26414"
#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 2012-01-11 03:23:28 UTC (rev 53837)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-01-11 03:32:31 UTC (rev 53838)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26413
+BuildNum=26414
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...> - 2012-01-12 03:29:17
|
Revision: 53849
http://firebird.svn.sourceforge.net/firebird/?rev=53849&view=rev
Author: firebirds
Date: 2012-01-12 03:29:11 +0000 (Thu, 12 Jan 2012)
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 2012-01-12 03:22:12 UTC (rev 53848)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-01-12 03:29:11 UTC (rev 53849)
@@ -1,3 +1,7 @@
+ 2012-01-11 13:04 alexpeshkoff
+ M builds/posix/Makefile.in.client.isql
+Applied Michal's patch
+
2012-01-10 05:27 dimitr
M src/jrd/Optimizer.cpp
The simplest possible fix for CORE-3722: IS NOT DISTINCT FROM NULL doesn't use index.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-01-12 03:22:12 UTC (rev 53848)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-01-12 03:29:11 UTC (rev 53849)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26414
+ FORMAL BUILD NUMBER:26415
*/
-#define PRODUCT_VER_STRING "2.5.2.26414"
-#define FILE_VER_STRING "WI-V2.5.2.26414"
-#define LICENSE_VER_STRING "WI-V2.5.2.26414"
-#define FILE_VER_NUMBER 2, 5, 2, 26414
+#define PRODUCT_VER_STRING "2.5.2.26415"
+#define FILE_VER_STRING "WI-V2.5.2.26415"
+#define LICENSE_VER_STRING "WI-V2.5.2.26415"
+#define FILE_VER_NUMBER 2, 5, 2, 26415
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26414"
+#define FB_BUILD_NO "26415"
#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 2012-01-12 03:22:12 UTC (rev 53848)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-01-12 03:29:11 UTC (rev 53849)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26414
+BuildNum=26415
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...> - 2012-01-13 03:31:07
|
Revision: 53856
http://firebird.svn.sourceforge.net/firebird/?rev=53856&view=rev
Author: firebirds
Date: 2012-01-13 03:31:00 +0000 (Fri, 13 Jan 2012)
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 2012-01-13 03:23:35 UTC (rev 53855)
+++ firebird/branches/B2_5_Release/ChangeLog 2012-01-13 03:31:00 UTC (rev 53856)
@@ -1,3 +1,24 @@
+ 2012-01-12 15:02 alexpeshkoff
+ M builds/posix/Makefile.in.boot.gpre
+ M builds/posix/Makefile.in.client.fbudf
+ M builds/posix/Makefile.in.codes
+ M builds/posix/Makefile.in.embed.fbudf
+ M builds/posix/Makefile.in.examples
+ M builds/posix/Makefile.in.fbserver
+ M builds/posix/Makefile.in.fbtrace
+ M builds/posix/Makefile.in.intl
+ M builds/posix/Makefile.in.libfbclient
+ M builds/posix/Makefile.in.libfbstatic
+ M builds/posix/Makefile.in.msgs
+ M builds/posix/Makefile.in.refDatabases
+ M builds/posix/Makefile.in.smp_server
+ M builds/posix/Makefile.in.static.createdb
+ M builds/posix/Makefile.in.static.gbak
+ M builds/posix/Makefile.in.static.gpre
+ M builds/posix/Makefile.in.static.isql
+ M builds/posix/make.rules
+Backported fix for CORE-3727: Support C preprocessor flags in firebird build system
+
2012-01-11 13:04 alexpeshkoff
M builds/posix/Makefile.in.client.isql
Applied Michal's patch
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-01-13 03:23:35 UTC (rev 53855)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2012-01-13 03:31:00 UTC (rev 53856)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26415
+ FORMAL BUILD NUMBER:26416
*/
-#define PRODUCT_VER_STRING "2.5.2.26415"
-#define FILE_VER_STRING "WI-V2.5.2.26415"
-#define LICENSE_VER_STRING "WI-V2.5.2.26415"
-#define FILE_VER_NUMBER 2, 5, 2, 26415
+#define PRODUCT_VER_STRING "2.5.2.26416"
+#define FILE_VER_STRING "WI-V2.5.2.26416"
+#define LICENSE_VER_STRING "WI-V2.5.2.26416"
+#define FILE_VER_NUMBER 2, 5, 2, 26416
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "2"
-#define FB_BUILD_NO "26415"
+#define FB_BUILD_NO "26416"
#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 2012-01-13 03:23:35 UTC (rev 53855)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2012-01-13 03:31:00 UTC (rev 53856)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=2
-BuildNum=26415
+BuildNum=26416
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