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

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

Revision: 52729
          http://firebird.svn.sourceforge.net/firebird/?rev=52729&view=rev
Author:   firebirds
Date:     2011-04-15 03:22:55 +0000 (Fri, 15 Apr 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-04-15 03:15:51 UTC (rev 52728)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-04-15 03:22:55 UTC (rev 52729)
@@ -1,3 +1,11 @@
+ 2011-04-14 12:07  hvlad 
+   M src/lock/lock.cpp
+Moved assertion out of loop else it could wrongly fire at second execution
+
+ 2011-04-14 09:03  paul_reeves 
+   M src/misc/headers.sed
+add consts_pub.h to list of #include lines to exclude from non-production version of ibase.h. 
+
  2011-04-13 10:26  hvlad 
    M src/jrd/event.cpp
 Fixed bug CORE-3440 : AV in engine if isc_que_events queued 0 events

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-04-15 03:15:51 UTC (rev 52728)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-04-15 03:22:55 UTC (rev 52729)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26254
+  FORMAL BUILD NUMBER:26256
 */
 
-#define PRODUCT_VER_STRING "2.5.1.26254"
-#define FILE_VER_STRING "WI-V2.5.1.26254"
-#define LICENSE_VER_STRING "WI-V2.5.1.26254"
-#define FILE_VER_NUMBER 2, 5, 1, 26254
+#define PRODUCT_VER_STRING "2.5.1.26256"
+#define FILE_VER_STRING "WI-V2.5.1.26256"
+#define LICENSE_VER_STRING "WI-V2.5.1.26256"
+#define FILE_VER_NUMBER 2, 5, 1, 26256
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "1"
-#define FB_BUILD_NO "26254"
+#define FB_BUILD_NO "26256"
 #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-04-15 03:15:51 UTC (rev 52728)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-04-15 03:22:55 UTC (rev 52729)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=1
-BuildNum=26254
+BuildNum=26256
 
 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.