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

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

Revision: 54338
          http://firebird.svn.sourceforge.net/firebird/?rev=54338&view=rev
Author:   firebirds
Date:     2012-04-08 05:20:49 +0000 (Sun, 08 Apr 2012)
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	2012-04-08 04:52:55 UTC (rev 54337)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-04-08 05:20:49 UTC (rev 54338)
@@ -1,3 +1,12 @@
+ 2012-04-07 18:06  hvlad 
+   M src/isql/isql.epp
+Fixed bug CORE-3810 : isql: zero divide + coredump when use "-pag 0" command switch & set heading on inside .sql script
+
+ 2012-04-07 09:07  dimitr 
+   M src/lock/lock.cpp
+   M src/lock/lock_proto.h
+Fixed CORE-3686: Incorrect (zero) values are reported for "acquire blocks" and "mutex wait" counters in the fb_lock_print output.
+
  2012-04-06 09:07  hvlad 
    M builds/install/misc/firebird.conf.in
 Misc

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-04-08 04:52:55 UTC (rev 54337)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-04-08 05:20:49 UTC (rev 54338)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26461
+  FORMAL BUILD NUMBER:26463
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26461"
-#define FILE_VER_STRING "WI-V2.5.2.26461"
-#define LICENSE_VER_STRING "WI-V2.5.2.26461"
-#define FILE_VER_NUMBER 2, 5, 2, 26461
+#define PRODUCT_VER_STRING "2.5.2.26463"
+#define FILE_VER_STRING "WI-V2.5.2.26463"
+#define LICENSE_VER_STRING "WI-V2.5.2.26463"
+#define FILE_VER_NUMBER 2, 5, 2, 26463
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26461"
+#define FB_BUILD_NO "26463"
 #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	2012-04-08 04:52:55 UTC (rev 54337)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-04-08 05:20:49 UTC (rev 54338)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26461
+BuildNum=26463
 
 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.