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

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

Revision: 54100
          http://firebird.svn.sourceforge.net/firebird/?rev=54100&view=rev
Author:   firebirds
Date:     2012-03-06 04:58:09 +0000 (Tue, 06 Mar 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-03-06 04:50:49 UTC (rev 54099)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-03-06 04:58:09 UTC (rev 54100)
@@ -1,3 +1,11 @@
+ 2012-03-05 13:48  dimitr 
+   M src/jrd/cmp.cpp
+Fixed the commit mistake.
+
+ 2012-03-05 13:47  dimitr 
+   M src/jrd/cmp.cpp
+Fixed CORE-3777: Conversion error from string when using GROUP BY.
+
  2012-03-03 16:48  alexpeshkoff 
    M src/burp/backup.epp
    M src/burp/burp.cpp

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-03-06 04:50:49 UTC (rev 54099)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-03-06 04:58:09 UTC (rev 54100)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26431
+  FORMAL BUILD NUMBER:26433
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26431"
-#define FILE_VER_STRING "WI-V2.5.2.26431"
-#define LICENSE_VER_STRING "WI-V2.5.2.26431"
-#define FILE_VER_NUMBER 2, 5, 2, 26431
+#define PRODUCT_VER_STRING "2.5.2.26433"
+#define FILE_VER_STRING "WI-V2.5.2.26433"
+#define LICENSE_VER_STRING "WI-V2.5.2.26433"
+#define FILE_VER_NUMBER 2, 5, 2, 26433
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26431"
+#define FB_BUILD_NO "26433"
 #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-03-06 04:50:49 UTC (rev 54099)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-03-06 04:58:09 UTC (rev 54100)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26431
+BuildNum=26433
 
 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.