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

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

Revision: 58324
          http://sourceforge.net/p/firebird/code/58324
Author:   firebirds
Date:     2013-07-08 01:39:30 +0000 (Mon, 08 Jul 2013)
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	2013-07-08 00:56:47 UTC (rev 58323)
+++ firebird/branches/B2_5_Release/ChangeLog	2013-07-08 01:39:30 UTC (rev 58324)
@@ -1,3 +1,13 @@
+ 2013-07-07 15:11  dimitr 
+   M src/jrd/Optimizer.cpp
+   M src/jrd/Optimizer.h
+   M src/jrd/opt.cpp
+Unfortunately, the only correct way to reference stream internals (e.g. get field descriptors) in node comparison routines is either to compare nodes along with their corresponding CSBs or to compare only nodes and handle streams outside. I'm favoring the latter approach. And no, remapping is a wrong solution either (trunk is to be reworked again in this regard, sigh). This fixes CORE-4139 at the cost of removed CAST vs FIELD comparison trick. Let's see whether somebody is going to be affected.
+
+ 2013-07-07 02:02  asfernandes 
+   M src/jrd/unicode_util.cpp
+Fixed CORE-4136 - Sharp-S character treated incorrectly in UNICODE_CI_AI collation.
+
  2013-07-03 13:20  dimitr 
    M src/jrd/Database.cpp
    M src/jrd/Database.h

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2013-07-08 00:56:47 UTC (rev 58323)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2013-07-08 01:39:30 UTC (rev 58324)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26669
+  FORMAL BUILD NUMBER:26671
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26669"
-#define FILE_VER_STRING "WI-V2.5.3.26669"
-#define LICENSE_VER_STRING "WI-V2.5.3.26669"
-#define FILE_VER_NUMBER 2, 5, 3, 26669
+#define PRODUCT_VER_STRING "2.5.3.26671"
+#define FILE_VER_STRING "WI-V2.5.3.26671"
+#define LICENSE_VER_STRING "WI-V2.5.3.26671"
+#define FILE_VER_NUMBER 2, 5, 3, 26671
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26669"
+#define FB_BUILD_NO "26671"
 #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	2013-07-08 00:56:47 UTC (rev 58323)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2013-07-08 01:39:30 UTC (rev 58324)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26669
+BuildNum=26671
 
 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.