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

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

Revision: 53689
          http://firebird.svn.sourceforge.net/firebird/?rev=53689&view=rev
Author:   firebirds
Date:     2011-12-11 03:28:07 +0000 (Sun, 11 Dec 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-12-11 01:26:03 UTC (rev 53688)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-12-11 03:28:07 UTC (rev 53689)
@@ -1,3 +1,7 @@
+ 2011-12-11 01:26  asfernandes 
+   M src/jrd/blb.cpp
+Backported fix for CORE-3601 - Incorrect TEXT BLOB charset transliteration on VIEW with trigger.
+
  2011-12-06 13:12  dimitr 
    M src/jrd/trig.h
 Fixed CORE-3692: Cannot drop a NOT NULL constraint on a field participating in the UNIQUE constraint.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-12-11 01:26:03 UTC (rev 53688)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-12-11 03:28:07 UTC (rev 53689)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26396
+  FORMAL BUILD NUMBER:26397
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26396"
-#define FILE_VER_STRING "WI-V2.5.2.26396"
-#define LICENSE_VER_STRING "WI-V2.5.2.26396"
-#define FILE_VER_NUMBER 2, 5, 2, 26396
+#define PRODUCT_VER_STRING "2.5.2.26397"
+#define FILE_VER_STRING "WI-V2.5.2.26397"
+#define LICENSE_VER_STRING "WI-V2.5.2.26397"
+#define FILE_VER_NUMBER 2, 5, 2, 26397
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26396"
+#define FB_BUILD_NO "26397"
 #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-12-11 01:26:03 UTC (rev 53688)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-12-11 03:28:07 UTC (rev 53689)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26396
+BuildNum=26397
 
 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.