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

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

Revision: 63023
          http://sourceforge.net/p/firebird/code/63023
Author:   firebirds
Date:     2016-02-26 00:09:25 +0000 (Fri, 26 Feb 2016)
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	2016-02-25 22:02:18 UTC (rev 63022)
+++ firebird/trunk/ChangeLog	2016-02-26 00:09:25 UTC (rev 63023)
@@ -1,3 +1,24 @@
+ 2016-02-25 09:20  hvlad 
+   M src/dsql/BoolNodes.cpp
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/StmtNodes.cpp
+   M src/jrd/exe.h
+This should fix known issues with MERGE and stable cursor (see CORE-3362).
+Thanks to Dmitry for idea
+
+ 2016-02-25 02:11  asfernandes 
+   M src/gpre/gpre.cpp
+Convert the file to UTF-8 as grep thinks it's a binary file.
+
+ 2016-02-25 01:50  asfernandes 
+   M src/dsql/dsql.cpp
+   M src/jrd/tpc.cpp
+Misc.
+
+ 2016-02-25 01:07  asfernandes 
+   M doc/Using_OO_API.html
+Typos.
+
  2016-02-24 20:11  dimitr 
    M src/dsql/ExprNodes.cpp
    M src/dsql/ExprNodes.h

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2016-02-25 22:02:18 UTC (rev 63022)
+++ firebird/trunk/src/jrd/build_no.h	2016-02-26 00:09:25 UTC (rev 63023)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:32358
+  FORMAL BUILD NUMBER:32362
 */
 
-#define PRODUCT_VER_STRING "3.0.0.32358"
-#define FILE_VER_STRING "WI-V3.0.0.32358"
-#define LICENSE_VER_STRING "WI-V3.0.0.32358"
-#define FILE_VER_NUMBER 3, 0, 0, 32358
+#define PRODUCT_VER_STRING "3.0.0.32362"
+#define FILE_VER_STRING "WI-V3.0.0.32362"
+#define LICENSE_VER_STRING "WI-V3.0.0.32362"
+#define FILE_VER_NUMBER 3, 0, 0, 32362
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "32358"
+#define FB_BUILD_NO "32362"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2016-02-25 22:02:18 UTC (rev 63022)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2016-02-26 00:09:25 UTC (rev 63023)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=32358
+BuildNum=32362
 
 NowAt=`pwd`
 cd `dirname $0`

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