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

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

Revision: 53698
          http://firebird.svn.sourceforge.net/firebird/?rev=53698&view=rev
Author:   firebirds
Date:     2011-12-15 03:28:00 +0000 (Thu, 15 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-15 03:21:11 UTC (rev 53697)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-12-15 03:28:00 UTC (rev 53698)
@@ -1,3 +1,11 @@
+ 2011-12-14 16:08  dimitr 
+   M src/dsql/gen.cpp
+Fixed (methinks) CORE-3697: String truncation error when selecting from a VIEW with UNION inside. It doesn't look like a good idea to modify dsc_length in place, as it can be used afterwards (e.g. MAKE_desc(field) after GEN_expr(rse), see define_view() in ddl.cpp). We only need to ensure that the generated BLR has the real byte length and it can be achieved with a temporary descriptor copy. Other solutions are also possible but this one seems better at the first glance.
+
+ 2011-12-14 14:49  paulbeach 
+   M builds/install/arch-specific/darwin/preupgrade-script
+CORE-3862 - Multiple update installs can cause problems.
+
  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.

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