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

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

Revision: 52171
          http://firebird.svn.sourceforge.net/firebird/?rev=52171&view=rev
Author:   firebirds
Date:     2011-01-21 03:49:47 +0000 (Fri, 21 Jan 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-01-21 03:28:15 UTC (rev 52170)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-01-21 03:49:47 UTC (rev 52171)
@@ -1,3 +1,11 @@
+ 2011-01-20 07:00  dimitr 
+   M src/jrd/Optimizer.cpp
+Fixed CORE-3312: Sub-optimal join plan when the slave table depends on the master one via the OR predicate.
+
+ 2011-01-20 04:39  dimitr 
+   M src/dsql/pass1.cpp
+Fixed CORE-3311: Error "data type unknown" while preparing UPDATE/DELETE statements with the parameterized ROWS clause.
+
  2011-01-19 12:58  alexpeshkoff 
    M src/common/config/config.cpp
    M src/common/config/config.h

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-01-21 03:28:15 UTC (rev 52170)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-01-21 03:49:47 UTC (rev 52171)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26180
+  FORMAL BUILD NUMBER:26182
 */
 
-#define PRODUCT_VER_STRING "2.5.1.26180"
-#define FILE_VER_STRING "WI-V2.5.1.26180"
-#define LICENSE_VER_STRING "WI-V2.5.1.26180"
-#define FILE_VER_NUMBER 2, 5, 1, 26180
+#define PRODUCT_VER_STRING "2.5.1.26182"
+#define FILE_VER_STRING "WI-V2.5.1.26182"
+#define LICENSE_VER_STRING "WI-V2.5.1.26182"
+#define FILE_VER_NUMBER 2, 5, 1, 26182
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "1"
-#define FB_BUILD_NO "26180"
+#define FB_BUILD_NO "26182"
 #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-01-21 03:28:15 UTC (rev 52170)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-01-21 03:49:47 UTC (rev 52171)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=1
-BuildNum=26180
+BuildNum=26182
 
 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.