[Firebird-checkins] SF.net SVN: firebird:[54604] firebird/branches/B2_5_Release

[<fir...@us...>]

Revision: 54604
          http://firebird.svn.sourceforge.net/firebird/?rev=54604&view=rev
Author:   firebirds
Date:     2012-06-05 03:47:46 +0000 (Tue, 05 Jun 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-06-05 03:30:58 UTC (rev 54603)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-06-05 03:47:46 UTC (rev 54604)
@@ -1,3 +1,17 @@
+ 2012-06-04 16:53  alexpeshkoff 
+   M src/utilities/fbsvcmgr.cpp
+   M src/utilities/fbtracemgr/traceMgrMain.cpp
+Fixed CORE-3769: The message 'Unknown tag (4) in isc_svc_query() results' appears when fbtracemgr is interrupted by Ctrl-C
+
+ 2012-06-04 08:57  dimitr 
+   M src/jrd/btr.cpp
+   M src/jrd/btr.h
+   M src/jrd/dfw.epp
+   M src/jrd/ini.epp
+   M src/jrd/ods.h
+   M src/jrd/pcmet.epp
+Rolled back the ODS level solution for CORE-2709 as it causes cross-version compatibility issues (CORE-3853) as well as functional regressions (CORE-3675). Another solution is likely to be committed instead.
+
  2012-05-31 11:01  alexpeshkoff 
    M src/common/classes/semaphore.cpp
 Backported fix for 32-bit build

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-05 03:30:58 UTC (rev 54603)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-06-05 03:47:46 UTC (rev 54604)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26492
+  FORMAL BUILD NUMBER:26494
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26492"
-#define FILE_VER_STRING "WI-V2.5.2.26492"
-#define LICENSE_VER_STRING "WI-V2.5.2.26492"
-#define FILE_VER_NUMBER 2, 5, 2, 26492
+#define PRODUCT_VER_STRING "2.5.2.26494"
+#define FILE_VER_STRING "WI-V2.5.2.26494"
+#define LICENSE_VER_STRING "WI-V2.5.2.26494"
+#define FILE_VER_NUMBER 2, 5, 2, 26494
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26492"
+#define FB_BUILD_NO "26494"
 #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-06-05 03:30:58 UTC (rev 54603)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-06-05 03:47:46 UTC (rev 54604)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26492
+BuildNum=26494
 
 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.