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

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

Revision: 52090
          http://firebird.svn.sourceforge.net/firebird/?rev=52090&view=rev
Author:   firebirds
Date:     2011-01-03 03:30:25 +0000 (Mon, 03 Jan 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-01-02 22:15:33 UTC (rev 52089)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-01-03 03:30:25 UTC (rev 52090)
@@ -1,3 +1,8 @@
+ 2011-01-02 22:15  hvlad 
+   M src/jrd/exe.cpp
+More conservative fix for CORE-3282 : EXECUTE STATEMENT parses the SQL text using wrong charset.
+Convert into attachment charset query text only
+
  2010-12-28 12:01  dimitr 
    M src/jrd/dpm.epp
 CORE-3295: Estimate the actual record compression ratio in the optimizer.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-01-02 22:15:33 UTC (rev 52089)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-01-03 03:30:25 UTC (rev 52090)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26160
+  FORMAL BUILD NUMBER:26161
 */
 
-#define PRODUCT_VER_STRING "2.5.1.26160"
-#define FILE_VER_STRING "WI-V2.5.1.26160"
-#define LICENSE_VER_STRING "WI-V2.5.1.26160"
-#define FILE_VER_NUMBER 2, 5, 1, 26160
+#define PRODUCT_VER_STRING "2.5.1.26161"
+#define FILE_VER_STRING "WI-V2.5.1.26161"
+#define LICENSE_VER_STRING "WI-V2.5.1.26161"
+#define FILE_VER_NUMBER 2, 5, 1, 26161
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "1"
-#define FB_BUILD_NO "26160"
+#define FB_BUILD_NO "26161"
 #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-01-02 22:15:33 UTC (rev 52089)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-01-03 03:30:25 UTC (rev 52090)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=1
-BuildNum=26160
+BuildNum=26161
 
 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.