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

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

Revision: 52405
          http://firebird.svn.sourceforge.net/firebird/?rev=52405&view=rev
Author:   firebirds
Date:     2011-02-19 03:25:38 +0000 (Sat, 19 Feb 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-02-19 03:15:06 UTC (rev 52404)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-02-19 03:25:38 UTC (rev 52405)
@@ -1,3 +1,31 @@
+ 2011-02-18 06:52  dimitr 
+   M src/isql/isql.epp
+Restored the pre-v2.5 logic by the customer request.
+
+ 2011-02-18 06:26  dimitr 
+   M src/jrd/evl.cpp
+Fixed the main reason for CORE-3233: LIKE, STARTING and CONTAINING fail if second operand >= 32K. Thanks to Adriano.
+
+ 2011-02-18 04:37  robocop 
+   M src/jrd/SysFunction.cpp
+Make sure at least one operand is promoted to FB_UINT64 before doing the multiplication.
+
+ 2011-02-18 04:35  robocop 
+   M src/remote/server.cpp
+Misc.
+
+ 2011-02-18 04:33  robocop 
+   M src/jrd/scl.epp
+Misc.
+
+ 2011-02-18 04:32  robocop 
+   M src/jrd/lck.cpp
+Misc.
+
+ 2011-02-18 04:30  robocop 
+   M src/jrd/isc_sync.cpp
+Simplification.
+
  2011-02-17 17:25  dimitr 
    M src/jrd/evl.cpp
 Fixed inability to execute LIKE/STARTING/etc if the second argument is a small (<32KB) blob and the first one is a blob of charset NONE. This is partially related to CORE-3233, see my comment there.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-02-19 03:15:06 UTC (rev 52404)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-02-19 03:25:38 UTC (rev 52405)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26213
+  FORMAL BUILD NUMBER:26220
 */
 
-#define PRODUCT_VER_STRING "2.5.1.26213"
-#define FILE_VER_STRING "WI-V2.5.1.26213"
-#define LICENSE_VER_STRING "WI-V2.5.1.26213"
-#define FILE_VER_NUMBER 2, 5, 1, 26213
+#define PRODUCT_VER_STRING "2.5.1.26220"
+#define FILE_VER_STRING "WI-V2.5.1.26220"
+#define LICENSE_VER_STRING "WI-V2.5.1.26220"
+#define FILE_VER_NUMBER 2, 5, 1, 26220
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "1"
-#define FB_BUILD_NO "26213"
+#define FB_BUILD_NO "26220"
 #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-02-19 03:15:06 UTC (rev 52404)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-02-19 03:25:38 UTC (rev 52405)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=1
-BuildNum=26213
+BuildNum=26220
 
 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.