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

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

Revision: 52883
          http://firebird.svn.sourceforge.net/firebird/?rev=52883&view=rev
Author:   firebirds
Date:     2011-05-06 03:17:35 +0000 (Fri, 06 May 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-05-05 22:05:59 UTC (rev 52882)
+++ firebird/trunk/ChangeLog	2011-05-06 03:17:35 UTC (rev 52883)
@@ -1,3 +1,24 @@
+ 2011-05-05 22:05  hvlad 
+   M src/jrd/dpm.epp
+Fixed bug CORE-3468 : Attempt to read after the end of file when nbackup state is stalled
+
+ 2011-05-05 18:11  hvlad 
+   M src/jrd/cch.cpp
+   M src/jrd/cch.h
+   M src/jrd/cch_proto.h
+   M src/jrd/nbak.cpp
+Fixed bug CORE-3466 : Some changes could be lost during the merge of delta file into main database file.
+Removed BDB_merge flag and related code.
+
+ 2011-05-05 17:40  hvlad 
+   M src/jrd/cch.cpp
+FiFixed bug CORE-3465 : Nbackup state lock could be not released after cache error. It results in "Can't lock state for write" bugcheck when backup state is going to be changed.
+
+ 2011-05-05 14:33  hvlad 
+   M src/jrd/cch.cpp
+Fixed bug CORE-3464.
+Correct error reporting - bugcheck's 215 and 216 was confused with each other.
+
  2011-05-03 12:03  hvlad 
    M src/common/classes/alloc.cpp
 Don't use placement new[] as its behavior is inconsistent between compilers

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2011-05-05 22:05:59 UTC (rev 52882)
+++ firebird/trunk/src/jrd/build_no.h	2011-05-06 03:17:35 UTC (rev 52883)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:29332
+  FORMAL BUILD NUMBER:29336
 */
 
-#define PRODUCT_VER_STRING "3.0.0.29332"
-#define FILE_VER_STRING "WI-T3.0.0.29332"
-#define LICENSE_VER_STRING "WI-T3.0.0.29332"
-#define FILE_VER_NUMBER 3, 0, 0, 29332
+#define PRODUCT_VER_STRING "3.0.0.29336"
+#define FILE_VER_STRING "WI-T3.0.0.29336"
+#define LICENSE_VER_STRING "WI-T3.0.0.29336"
+#define FILE_VER_NUMBER 3, 0, 0, 29336
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "29332"
+#define FB_BUILD_NO "29336"
 #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-05-05 22:05:59 UTC (rev 52882)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2011-05-06 03:17:35 UTC (rev 52883)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=29332
+BuildNum=29336
 
 NowAt=`pwd`
 cd `dirname $0`


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