[Firebird-checkins] SF.net SVN: firebird:[59269] firebird/trunk

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

Revision: 59269
          http://sourceforge.net/p/firebird/code/59269
Author:   firebirds
Date:     2014-03-16 00:44:59 +0000 (Sun, 16 Mar 2014)
Log Message:
-----------
nightly update

Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2014-03-15 18:43:45 UTC (rev 59268)
+++ firebird/trunk/ChangeLog	2014-03-16 00:44:59 UTC (rev 59269)
@@ -1,3 +1,14 @@
+ 2014-03-15 18:43  dimitr 
+   M src/dsql/ExprNodes.cpp
+Fixed CORE-4366: Wrong result of WHERE predicate when it contains NULL IS NOT DISTINCT FROM (select min(NULL) from ...)
+
+ 2014-03-15 18:00  dimitr 
+   M src/jrd/RecordSourceNodes.cpp
+   M src/jrd/opt.cpp
+   M src/jrd/opt_proto.h
+   M src/jrd/rse.h
+Refactored the conjuncts handling code in the optimizer to be simpler and avoid duplication. As a side effect, this also fixes CORE-4365: Equality predicate distribution does not work for some complex queries. Cleanup up some legacy checks that I consider unnecessary. 
+
  2014-03-14 16:45  asfernandes 
    M src/jrd/vio.cpp
 Fixed restore of sh_test.gbk in TCS.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-15 18:43:45 UTC (rev 59268)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-16 00:44:59 UTC (rev 59269)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30970
+  FORMAL BUILD NUMBER:30972
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30970"
-#define FILE_VER_STRING "WI-T3.0.0.30970"
-#define LICENSE_VER_STRING "WI-T3.0.0.30970"
-#define FILE_VER_NUMBER 3, 0, 0, 30970
+#define PRODUCT_VER_STRING "3.0.0.30972"
+#define FILE_VER_STRING "WI-T3.0.0.30972"
+#define LICENSE_VER_STRING "WI-T3.0.0.30972"
+#define FILE_VER_NUMBER 3, 0, 0, 30972
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30970"
+#define FB_BUILD_NO "30972"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-15 18:43:45 UTC (rev 59268)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-16 00:44:59 UTC (rev 59269)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30970
+BuildNum=30972
 
 NowAt=`pwd`
 cd `dirname $0`

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.