firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 21:23:03 +01:00
Code Issues

nightly update

Browse Source
This commit is contained in:
firebirds 2011-02-21 03:21:28 +00:00
parent dbd1775fc1
commit 0fb3676c67
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2011-02-20 13:25 dimitr
M src/jrd/Optimizer.cpp
M src/jrd/Optimizer.h
M src/jrd/opt.cpp
Fixed CORE-3176: View with "subselect" column join table and not use index.
2011-02-18 06:52 dimitr 2011-02-18 06:52 dimitr
M src/isql/isql.epp M src/isql/isql.epp
Restored the pre-v2.5 logic by the customer request. Restored the pre-v2.5 logic by the customer request.

12
src/jrd/build_no.h
View File

@ -3,16 +3,16 @@
*** DO NOT EDIT *** *** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh EDIT src/misc/writeBuildNum.sh
FORMAL BUILD NUMBER:26220 FORMAL BUILD NUMBER:26221
*/ */
#define PRODUCT_VER_STRING "2.5.1.26220" #define PRODUCT_VER_STRING "2.5.1.26221"
#define FILE_VER_STRING "WI-V2.5.1.26220" #define FILE_VER_STRING "WI-V2.5.1.26221"
#define LICENSE_VER_STRING "WI-V2.5.1.26220" #define LICENSE_VER_STRING "WI-V2.5.1.26221"
#define FILE_VER_NUMBER 2, 5, 1, 26220 #define FILE_VER_NUMBER 2, 5, 1, 26221
#define FB_MAJOR_VER "2" #define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5" #define FB_MINOR_VER "5"
#define FB_REV_NO "1" #define FB_REV_NO "1"
#define FB_BUILD_NO "26220" #define FB_BUILD_NO "26221"
#define FB_BUILD_TYPE "V" #define FB_BUILD_TYPE "V"
#define FB_BUILD_SUFFIX "Firebird 2.5" #define FB_BUILD_SUFFIX "Firebird 2.5"

2
src/misc/writeBuildNum.sh
View File

@ -9,7 +9,7 @@ BuildType=V
MajorVer=2 MajorVer=2
MinorVer=5 MinorVer=5
RevNo=1 RevNo=1
BuildNum=26220 BuildNum=26221
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds # Normal builds