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

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

Revision: 53339
          http://firebird.svn.sourceforge.net/firebird/?rev=53339&view=rev
Author:   firebirds
Date:     2011-07-21 03:30:18 +0000 (Thu, 21 Jul 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-07-20 10:35:00 UTC (rev 53338)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-07-21 03:30:18 UTC (rev 53339)
@@ -1,3 +1,9 @@
+ 2011-07-20 10:35  dimitr 
+   M src/jrd/cvt2.cpp
+   M src/jrd/cvt2_proto.h
+   M src/jrd/opt.cpp
+Attempted to have a [more or less] good solution for CORE-3553 (Nested loop plan is chosen instead of the sort merge for joining independent streams using keys of different types). It doesn't optimize all possible cases, but the most common ones.
+
  2011-07-17 09:38  hvlad 
    M src/jrd/dfw.epp
 Fixed bug CORE-3549 : Database corruption after end of session : page xxx is of wrong type expected 4 found 7

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-07-20 10:35:00 UTC (rev 53338)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-07-21 03:30:18 UTC (rev 53339)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26340
+  FORMAL BUILD NUMBER:26341
 */
 
-#define PRODUCT_VER_STRING "2.5.1.26340"
-#define FILE_VER_STRING "WI-V2.5.1.26340"
-#define LICENSE_VER_STRING "WI-V2.5.1.26340"
-#define FILE_VER_NUMBER 2, 5, 1, 26340
+#define PRODUCT_VER_STRING "2.5.1.26341"
+#define FILE_VER_STRING "WI-V2.5.1.26341"
+#define LICENSE_VER_STRING "WI-V2.5.1.26341"
+#define FILE_VER_NUMBER 2, 5, 1, 26341
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "1"
-#define FB_BUILD_NO "26340"
+#define FB_BUILD_NO "26341"
 #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-07-20 10:35:00 UTC (rev 53338)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-07-21 03:30:18 UTC (rev 53339)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=1
-BuildNum=26340
+BuildNum=26341
 
 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.