|
From: <fir...@us...> - 2010-12-09 03:34:06
|
Revision: 52032
http://firebird.svn.sourceforge.net/firebird/?rev=52032&view=rev
Author: firebirds
Date: 2010-12-09 03:33:59 +0000 (Thu, 09 Dec 2010)
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 2010-12-08 10:57:21 UTC (rev 52031)
+++ firebird/branches/B2_5_Release/ChangeLog 2010-12-09 03:33:59 UTC (rev 52032)
@@ -1,3 +1,7 @@
+ 2010-12-08 10:57 dimitr
+ M src/jrd/opt.cpp
+Backported CORE-1274 and CORE-1752.
+
2010-12-02 19:52 dimitr
M src/jrd/gds.cpp
InitPrefix::init() should never throw, it leads to the infinite recursion with a stack overflow.
Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h 2010-12-08 10:57:21 UTC (rev 52031)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h 2010-12-09 03:33:59 UTC (rev 52032)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:26151
+ FORMAL BUILD NUMBER:26152
*/
-#define PRODUCT_VER_STRING "2.5.1.26151"
-#define FILE_VER_STRING "WI-V2.5.1.26151"
-#define LICENSE_VER_STRING "WI-V2.5.1.26151"
-#define FILE_VER_NUMBER 2, 5, 1, 26151
+#define PRODUCT_VER_STRING "2.5.1.26152"
+#define FILE_VER_STRING "WI-V2.5.1.26152"
+#define LICENSE_VER_STRING "WI-V2.5.1.26152"
+#define FILE_VER_NUMBER 2, 5, 1, 26152
#define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5"
#define FB_REV_NO "1"
-#define FB_BUILD_NO "26151"
+#define FB_BUILD_NO "26152"
#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 2010-12-08 10:57:21 UTC (rev 52031)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh 2010-12-09 03:33:59 UTC (rev 52032)
@@ -9,7 +9,7 @@
MajorVer=2
MinorVer=5
RevNo=1
-BuildNum=26151
+BuildNum=26152
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.
|