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

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

Revision: 53587
          http://firebird.svn.sourceforge.net/firebird/?rev=53587&view=rev
Author:   firebirds
Date:     2011-10-23 03:19:20 +0000 (Sun, 23 Oct 2011)
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	2011-10-23 01:31:11 UTC (rev 53586)
+++ firebird/trunk/ChangeLog	2011-10-23 03:19:20 UTC (rev 53587)
@@ -1,3 +1,12 @@
+ 2011-10-23 01:31  asfernandes 
+   M doc/sql.extensions/README.merge.txt
+   M doc/sql.extensions/README.returning
+   M src/dsql/StmtNodes.cpp
+   M src/dsql/StmtNodes.h
+   M src/dsql/parse.y
+Improvement CORE-3639 - Allow the use of multiple WHEN MATCHED / NOT MATCHED clauses in MERGE, as per the SQL 2008 specification.
+Also updated MERGE and RETURNING docs, and fixed a bug with MERGE WHEN MATCHED DELETE and RETURNING.
+
  2011-10-20 12:20  alexpeshkoff 
    M src/auth/AuthDbg.cpp
    M src/auth/trusted/AuthSspi.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2011-10-23 01:31:11 UTC (rev 53586)
+++ firebird/trunk/src/jrd/build_no.h	2011-10-23 03:19:20 UTC (rev 53587)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:29592
+  FORMAL BUILD NUMBER:29593
 */
 
-#define PRODUCT_VER_STRING "3.0.0.29592"
-#define FILE_VER_STRING "WI-T3.0.0.29592"
-#define LICENSE_VER_STRING "WI-T3.0.0.29592"
-#define FILE_VER_NUMBER 3, 0, 0, 29592
+#define PRODUCT_VER_STRING "3.0.0.29593"
+#define FILE_VER_STRING "WI-T3.0.0.29593"
+#define LICENSE_VER_STRING "WI-T3.0.0.29593"
+#define FILE_VER_NUMBER 3, 0, 0, 29593
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "29592"
+#define FB_BUILD_NO "29593"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2011-10-23 01:31:11 UTC (rev 53586)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2011-10-23 03:19:20 UTC (rev 53587)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=29592
+BuildNum=29593
 
 NowAt=`pwd`
 cd `dirname $0`

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