diff --git a/ChangeLog b/ChangeLog index 932c706440..5f7045abe0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + 2012-04-13 09:09 dimitr + M src/dsql/pass1.cpp +Additional fix for CORE-3807. Otherwise, _utf8 'A' is considered equal to _win1251 'ABCD' etc. The original code didn't check for charsets/collations but IMHO this was wrong. + 2012-04-12 16:32 dimitr M src/jrd/os/posix/unix.cpp M src/jrd/os/win32/winnt.cpp diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index b53d2669d5..a154420093 100644 --- a/src/jrd/build_no.h +++ b/src/jrd/build_no.h @@ -3,16 +3,16 @@ *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE EDIT src/misc/writeBuildNum.sh - FORMAL BUILD NUMBER:26466 + FORMAL BUILD NUMBER:26467 */ -#define PRODUCT_VER_STRING "2.5.2.26466" -#define FILE_VER_STRING "WI-V2.5.2.26466" -#define LICENSE_VER_STRING "WI-V2.5.2.26466" -#define FILE_VER_NUMBER 2, 5, 2, 26466 +#define PRODUCT_VER_STRING "2.5.2.26467" +#define FILE_VER_STRING "WI-V2.5.2.26467" +#define LICENSE_VER_STRING "WI-V2.5.2.26467" +#define FILE_VER_NUMBER 2, 5, 2, 26467 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "5" #define FB_REV_NO "2" -#define FB_BUILD_NO "26466" +#define FB_BUILD_NO "26467" #define FB_BUILD_TYPE "V" #define FB_BUILD_SUFFIX "Firebird 2.5" diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index b6e90bd6f2..24682d849c 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -9,7 +9,7 @@ BuildType=V MajorVer=2 MinorVer=5 RevNo=2 -BuildNum=26466 +BuildNum=26467 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then # Normal builds