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

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

Revision: 59998
          http://sourceforge.net/p/firebird/code/59998
Author:   firebirds
Date:     2014-08-26 01:27:46 +0000 (Tue, 26 Aug 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-08-25 14:04:50 UTC (rev 59997)
+++ firebird/trunk/ChangeLog	2014-08-26 01:27:46 UTC (rev 59998)
@@ -1,3 +1,17 @@
+ 2014-08-25 14:04  alexpeshkoff 
+   M examples/dbcrypt/DbCrypt.cpp
+Make a dbCrypt sample a little more interesting
+
+ 2014-08-25 13:28  dimitr 
+   M src/jrd/Optimizer.cpp
+Fixed CORE-4530: DB_KEY based join of two tables may be ineffective.
+
+ 2014-08-25 11:35  dimitr 
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/ExprNodes.h
+   M src/jrd/opt.cpp
+Attempt for CORE-4528: Allow hash/merge joins for non-field (dbkey or derived expression) equalities.
+
  2014-08-21 08:00  alexpeshkoff 
    M src/jrd/Mapping.cpp
 Explicitly avoid processing records about already seen databases when mapping auth info

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-08-25 14:04:50 UTC (rev 59997)
+++ firebird/trunk/src/jrd/build_no.h	2014-08-26 01:27:46 UTC (rev 59998)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31301
+  FORMAL BUILD NUMBER:31304
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31301"
-#define FILE_VER_STRING "WI-T3.0.0.31301"
-#define LICENSE_VER_STRING "WI-T3.0.0.31301"
-#define FILE_VER_NUMBER 3, 0, 0, 31301
+#define PRODUCT_VER_STRING "3.0.0.31304"
+#define FILE_VER_STRING "WI-T3.0.0.31304"
+#define LICENSE_VER_STRING "WI-T3.0.0.31304"
+#define FILE_VER_NUMBER 3, 0, 0, 31304
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31301"
+#define FB_BUILD_NO "31304"
 #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-08-25 14:04:50 UTC (rev 59997)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-08-26 01:27:46 UTC (rev 59998)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31301
+BuildNum=31304
 
 NowAt=`pwd`
 cd `dirname $0`

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