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

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

Revision: 58283
          http://sourceforge.net/p/firebird/code/58283
Author:   firebirds
Date:     2013-07-01 01:03:46 +0000 (Mon, 01 Jul 2013)
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	2013-07-01 00:39:51 UTC (rev 58282)
+++ firebird/branches/B2_5_Release/ChangeLog	2013-07-01 01:03:46 UTC (rev 58283)
@@ -1,3 +1,7 @@
+ 2013-06-30 19:13  hvlad 
+   M src/jrd/shut.cpp
+Backported from trunk: prevent starting a lot of threads when forced shutdown is in progress.
+
  2013-06-29 13:47  dimitr 
    M src/jrd/Optimizer.cpp
 Fixed CORE-4118: Expression index may be not used for derived fields or view fields. Also, generalized the old trick with CAST in expression indices.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2013-07-01 00:39:51 UTC (rev 58282)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2013-07-01 01:03:46 UTC (rev 58283)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26664
+  FORMAL BUILD NUMBER:26665
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26664"
-#define FILE_VER_STRING "WI-V2.5.3.26664"
-#define LICENSE_VER_STRING "WI-V2.5.3.26664"
-#define FILE_VER_NUMBER 2, 5, 3, 26664
+#define PRODUCT_VER_STRING "2.5.3.26665"
+#define FILE_VER_STRING "WI-V2.5.3.26665"
+#define LICENSE_VER_STRING "WI-V2.5.3.26665"
+#define FILE_VER_NUMBER 2, 5, 3, 26665
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26664"
+#define FB_BUILD_NO "26665"
 #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	2013-07-01 00:39:51 UTC (rev 58282)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2013-07-01 01:03:46 UTC (rev 58283)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26664
+BuildNum=26665
 
 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.