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

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

Revision: 60315
          http://sourceforge.net/p/firebird/code/60315
Author:   firebirds
Date:     2014-12-01 05:55:12 +0000 (Mon, 01 Dec 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-11-30 21:09:39 UTC (rev 60314)
+++ firebird/trunk/ChangeLog	2014-12-01 05:55:12 UTC (rev 60315)
@@ -1,3 +1,16 @@
+ 2014-11-30 21:09  asfernandes 
+   M src/common/os/win32/os_utils.cpp
+   M src/dsql/parse.y
+   M src/jrd/dpm.epp
+   M src/jrd/flu.cpp
+   M src/remote/inet.cpp
+   M src/remote/remote.cpp
+Misc.
+
+ 2014-11-30 16:00  dimitr 
+   M src/jrd/vio.cpp
+Simplest possible fix for CORE-4618: Rollback doesn`t undo changes when MERGE statement updates the same target rows multiple times and PLAN MERGE is used. An alternative solution is being considered.
+
  2014-11-29 15:39  mrotteveel 
    A doc/sql.extensions/README.offset_fetch.txt
    M doc/sql.extensions/README.rows

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-11-30 21:09:39 UTC (rev 60314)
+++ firebird/trunk/src/jrd/build_no.h	2014-12-01 05:55:12 UTC (rev 60315)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31456
+  FORMAL BUILD NUMBER:31458
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31456"
-#define FILE_VER_STRING "WI-T3.0.0.31456"
-#define LICENSE_VER_STRING "WI-T3.0.0.31456"
-#define FILE_VER_NUMBER 3, 0, 0, 31456
+#define PRODUCT_VER_STRING "3.0.0.31458"
+#define FILE_VER_STRING "WI-T3.0.0.31458"
+#define LICENSE_VER_STRING "WI-T3.0.0.31458"
+#define FILE_VER_NUMBER 3, 0, 0, 31458
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31456"
+#define FB_BUILD_NO "31458"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 1"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-11-30 21:09:39 UTC (rev 60314)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-12-01 05:55:12 UTC (rev 60315)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31456
+BuildNum=31458
 
 NowAt=`pwd`
 cd `dirname $0`

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