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

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

Revision: 52467
          http://firebird.svn.sourceforge.net/firebird/?rev=52467&view=rev
Author:   firebirds
Date:     2011-02-26 03:23:16 +0000 (Sat, 26 Feb 2011)

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	2011-02-26 03:16:03 UTC (rev 52466)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-02-26 03:23:16 UTC (rev 52467)
@@ -1,3 +1,11 @@
+ 2011-02-25 12:48  dimitr 
+   M src/jrd/Optimizer.cpp
+Fixed the regression I introduced recently. This is the simplest version of the fix.
+
+ 2011-02-25 09:42  dimitr 
+   M src/jrd/cmp.cpp
+Let's process the sub-node before using it in CMP_get_desc. It helps to avoid a crash if the sub-node is a variable (its e_var_variable argument is not assigned yet).
+
  2011-02-23 14:08  dimitr 
    M src/jrd/Database.cpp
    M src/jrd/Database.h

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-02-26 03:16:03 UTC (rev 52466)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-02-26 03:23:16 UTC (rev 52467)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26230
+  FORMAL BUILD NUMBER:26232
 */
 
-#define PRODUCT_VER_STRING "2.5.1.26230"
-#define FILE_VER_STRING "WI-V2.5.1.26230"
-#define LICENSE_VER_STRING "WI-V2.5.1.26230"
-#define FILE_VER_NUMBER 2, 5, 1, 26230
+#define PRODUCT_VER_STRING "2.5.1.26232"
+#define FILE_VER_STRING "WI-V2.5.1.26232"
+#define LICENSE_VER_STRING "WI-V2.5.1.26232"
+#define FILE_VER_NUMBER 2, 5, 1, 26232
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "1"
-#define FB_BUILD_NO "26230"
+#define FB_BUILD_NO "26232"
 #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	2011-02-26 03:16:03 UTC (rev 52466)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-02-26 03:23:16 UTC (rev 52467)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=1
-BuildNum=26230
+BuildNum=26232
 
 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.