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

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

Revision: 54508
          http://firebird.svn.sourceforge.net/firebird/?rev=54508&view=rev
Author:   firebirds
Date:     2012-05-18 03:35:20 +0000 (Fri, 18 May 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-05-18 03:21:36 UTC (rev 54507)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-05-18 03:35:20 UTC (rev 54508)
@@ -1,3 +1,15 @@
+ 2012-05-17 09:10  dimitr 
+   M src/jrd/par.cpp
+One more correction. This restores the accidentally changed original logic.
+
+ 2012-05-17 08:55  dimitr 
+   M src/jrd/par.cpp
+Correction.
+
+ 2012-05-17 08:08  dimitr 
+   M src/jrd/par.cpp
+More fixes for CORE-3557.
+
  2012-05-14 15:18  asfernandes 
    M src/dsql/pass1.cpp
 Backport fix for CORE-3611 - Wrong data while retrieving from CTEs (or derived tables) with same column names.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-05-18 03:21:36 UTC (rev 54507)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-05-18 03:35:20 UTC (rev 54508)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26482
+  FORMAL BUILD NUMBER:26485
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26482"
-#define FILE_VER_STRING "WI-V2.5.2.26482"
-#define LICENSE_VER_STRING "WI-V2.5.2.26482"
-#define FILE_VER_NUMBER 2, 5, 2, 26482
+#define PRODUCT_VER_STRING "2.5.2.26485"
+#define FILE_VER_STRING "WI-V2.5.2.26485"
+#define LICENSE_VER_STRING "WI-V2.5.2.26485"
+#define FILE_VER_NUMBER 2, 5, 2, 26485
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26482"
+#define FB_BUILD_NO "26485"
 #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-05-18 03:21:36 UTC (rev 54507)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-05-18 03:35:20 UTC (rev 54508)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26482
+BuildNum=26485
 
 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.