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

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

Revision: 58773
          http://sourceforge.net/p/firebird/code/58773
Author:   firebirds
Date:     2013-11-13 01:01:28 +0000 (Wed, 13 Nov 2013)
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	2013-11-12 19:30:46 UTC (rev 58772)
+++ firebird/trunk/ChangeLog	2013-11-13 01:01:28 UTC (rev 58773)
@@ -1,3 +1,26 @@
+ 2013-11-12 16:56  dimitr 
+   M src/jrd/nbak.cpp
+We're quite lucky this implicit conversion worked correctly. Fixed.
+
+ 2013-11-12 16:53  dimitr 
+   M src/jrd/btr.cpp
+Misc.
+
+ 2013-11-12 16:52  dimitr 
+   M src/jrd/GlobalRWLock.cpp
+   M src/jrd/pcmet.epp
+Fixed the status vector being left dirty after the non-critical lock manager error.
+This resolves CORE-4265: Unexpected lock conflict error may be raised while connecting to a heavily loaded database.
+
+ 2013-11-12 14:24  dimitr 
+   M src/jrd/tra.cpp
+Misc.
+
+ 2013-11-12 14:04  dimitr 
+   M src/dsql/DsqlCompilerScratch.cpp
+   M src/dsql/parse.y
+Fixed CORE-4240:  Recursive query in SQL query returns incorrect results if more than one branch bypass. The new code should work equally good with both binary and wide union trees.
+
  2013-11-11 14:44  hvlad 
    M src/jrd/jrd.cpp
    M src/jrd/tra.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-11-12 19:30:46 UTC (rev 58772)
+++ firebird/trunk/src/jrd/build_no.h	2013-11-13 01:01:28 UTC (rev 58773)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30718
+  FORMAL BUILD NUMBER:30723
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30718"
-#define FILE_VER_STRING "WI-T3.0.0.30718"
-#define LICENSE_VER_STRING "WI-T3.0.0.30718"
-#define FILE_VER_NUMBER 3, 0, 0, 30718
+#define PRODUCT_VER_STRING "3.0.0.30723"
+#define FILE_VER_STRING "WI-T3.0.0.30723"
+#define LICENSE_VER_STRING "WI-T3.0.0.30723"
+#define FILE_VER_NUMBER 3, 0, 0, 30723
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30718"
+#define FB_BUILD_NO "30723"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-11-12 19:30:46 UTC (rev 58772)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-11-13 01:01:28 UTC (rev 58773)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30718
+BuildNum=30723
 
 NowAt=`pwd`
 cd `dirname $0`

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