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

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

Revision: 52005
          http://firebird.svn.sourceforge.net/firebird/?rev=52005&view=rev
Author:   firebirds
Date:     2010-11-30 05:12:18 +0000 (Tue, 30 Nov 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-11-30 04:06:03 UTC (rev 52004)
+++ firebird/branches/B2_5_Release/ChangeLog	2010-11-30 05:12:18 UTC (rev 52005)
@@ -1,3 +1,13 @@
+ 2010-11-29 15:50  dimitr 
+   M src/jrd/Optimizer.cpp
+   M src/jrd/Optimizer.h
+Correction for one of my past commits. Also, unified the code a bit.
+
+ 2010-11-29 15:05  hvlad 
+   M src/remote/os/win32/srvr_w32.cpp
+   M src/remote/os/win32/window.cpp
+Fixed bug CORE-3266 : Race condition between async service detach request and running user trace service
+
  2010-11-28 19:51  dimitr 
    M src/jrd/pag.cpp
 Backport.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-11-30 04:06:03 UTC (rev 52004)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2010-11-30 05:12:18 UTC (rev 52005)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26145
+  FORMAL BUILD NUMBER:26147
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26145"
-#define FILE_VER_STRING "WI-V2.5.0.26145"
-#define LICENSE_VER_STRING "WI-V2.5.0.26145"
-#define FILE_VER_NUMBER 2, 5, 0, 26145
+#define PRODUCT_VER_STRING "2.5.0.26147"
+#define FILE_VER_STRING "WI-V2.5.0.26147"
+#define LICENSE_VER_STRING "WI-V2.5.0.26147"
+#define FILE_VER_NUMBER 2, 5, 0, 26147
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26145"
+#define FB_BUILD_NO "26147"
 #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-11-30 04:06:03 UTC (rev 52004)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2010-11-30 05:12:18 UTC (rev 52005)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26145
+BuildNum=26147
 
 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.