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

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

Revision: 61908
          http://sourceforge.net/p/firebird/code/61908
Author:   firebirds
Date:     2015-07-02 00:10:35 +0000 (Thu, 02 Jul 2015)
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	2015-07-01 21:53:38 UTC (rev 61907)
+++ firebird/trunk/ChangeLog	2015-07-02 00:10:35 UTC (rev 61908)
@@ -1,3 +1,19 @@
+ 2015-07-01 19:02  dimitr 
+   M src/isql/show.epp
+This should fix the SHOW SEQU output on 64-bit Linux.
+
+ 2015-07-01 17:10  asfernandes 
+   M src/dsql/StmtNodes.cpp
+Fixed CORE-4848 - MERGE ... WHEN NOT MATCHED ... RETURNING returns wrong (non-null) values when no insert is performed.
+
+ 2015-07-01 01:49  robocop 
+   M src/jrd/validation.h
+Misc.
+
+ 2015-07-01 01:10  robocop 
+   M doc/README.online_validation
+Misc.
+
  2015-06-30 16:01  alexpeshkoff 
    M src/include/consts_pub.h
    M src/jrd/Attachment.h

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-07-01 21:53:38 UTC (rev 61907)
+++ firebird/trunk/src/jrd/build_no.h	2015-07-02 00:10:35 UTC (rev 61908)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31907
+  FORMAL BUILD NUMBER:31911
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31907"
-#define FILE_VER_STRING "WI-T3.0.0.31907"
-#define LICENSE_VER_STRING "WI-T3.0.0.31907"
-#define FILE_VER_NUMBER 3, 0, 0, 31907
+#define PRODUCT_VER_STRING "3.0.0.31911"
+#define FILE_VER_STRING "WI-T3.0.0.31911"
+#define LICENSE_VER_STRING "WI-T3.0.0.31911"
+#define FILE_VER_NUMBER 3, 0, 0, 31911
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31907"
+#define FB_BUILD_NO "31911"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-07-01 21:53:38 UTC (rev 61907)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-07-02 00:10:35 UTC (rev 61908)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31907
+BuildNum=31911
 
 NowAt=`pwd`
 cd `dirname $0`

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