[Firebird-checkins] SF.net SVN: firebird:[53234] firebird/branches/B2_5_Release

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

Revision: 53234
          http://firebird.svn.sourceforge.net/firebird/?rev=53234&view=rev
Author:   firebirds
Date:     2011-06-25 03:24:04 +0000 (Sat, 25 Jun 2011)

Log Message:
-----------
nightly update

Modified Paths:
--------------
    firebird/branches/B2_5_Release/ChangeLog
    firebird/branches/B2_5_Release/src/jrd/build_no.h
    firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh

Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog	2011-06-25 03:17:23 UTC (rev 53233)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-06-25 03:24:04 UTC (rev 53234)
@@ -1,3 +1,39 @@
+ 2011-06-24 13:14  hvlad 
+   M src/jrd/tra.cpp
+   M src/jrd/vio.cpp
+   M src/jrd/vio_proto.h
+Backport improvement CORE-3537 : There is no need to undo changes made in GTT created with ON COMMIT DELETE ROWS option when transaction is rolled back.
+
+ 2011-06-24 13:08  hvlad 
+   M src/jrd/jrd.h
+   M src/jrd/tra.cpp
+   M src/jrd/tra.h
+   M src/jrd/vio.cpp
+Backport improvement CORE-3536 : Garbage collection in GTT is unnecessary delayed by active transactions in another attachments
+
+ 2011-06-24 11:52  hvlad 
+   M src/jrd/vio.cpp
+Delete deferred work when savepoint is cleaned up after failure even if no records was modified. Else DFW task will be repeated at commit making system tables logically inconsistent.
+
+ 2011-06-24 11:48  hvlad 
+   M src/jrd/tra.cpp
+Backported : don't try to undo changes when invalidated transaction is rolled back. I.e. force rollback via TIP if transaction was invalidated.
+
+ 2011-06-24 11:42  hvlad 
+   M src/jrd/cch.cpp
+Additional fix for correct Nbackup state lock accounting. See also CORE-3465
+
+ 2011-06-24 08:56  hvlad 
+   M src/jrd/nbak.cpp
+   M src/jrd/nbak.h
+Fixed bug CORE-3535 : Write target of dirty page could be undefined if error happens when nbackup state is changed.
+Also prevent overwriting of first page of allocation table by data page contents.
+
+ 2011-06-24 08:17  hvlad 
+   M src/jrd/nbak.h
+Additional patch for CORE-3521. 
+When CCH_flush() is called after last disconnect there is no attachment.
+
  2011-06-21 09:06  alexpeshkoff 
    M src/jrd/trace/TraceConfigStorage.cpp
    M src/jrd/trace/TraceConfigStorage.h

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-06-25 03:17:23 UTC (rev 53233)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-06-25 03:24:04 UTC (rev 53234)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26319
+  FORMAL BUILD NUMBER:26326
 */
 
-#define PRODUCT_VER_STRING "2.5.1.26319"
-#define FILE_VER_STRING "WI-V2.5.1.26319"
-#define LICENSE_VER_STRING "WI-V2.5.1.26319"
-#define FILE_VER_NUMBER 2, 5, 1, 26319
+#define PRODUCT_VER_STRING "2.5.1.26326"
+#define FILE_VER_STRING "WI-V2.5.1.26326"
+#define LICENSE_VER_STRING "WI-V2.5.1.26326"
+#define FILE_VER_NUMBER 2, 5, 1, 26326
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "1"
-#define FB_BUILD_NO "26319"
+#define FB_BUILD_NO "26326"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5"

Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-06-25 03:17:23 UTC (rev 53233)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-06-25 03:24:04 UTC (rev 53234)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=1
-BuildNum=26319
+BuildNum=26326
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds


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