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 2012-05-15 03:35:25 +00:00
parent 2da8379cf3
commit f5bc3dee8c
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2012-05-14 15:18 asfernandes
M src/dsql/pass1.cpp
Backport fix for CORE-3611 - Wrong data while retrieving from CTEs (or derived tables) with same column names.
2012-05-12 09:18 hvlad 2012-05-12 09:18 hvlad
M src/jrd/trace/TraceDSQLHelpers.h M src/jrd/trace/TraceDSQLHelpers.h
Fixed bug CORE-3845 : Interruption of 'heavy query' leads to 0 ms (zero duration) in it`s statistics in trace log Fixed bug CORE-3845 : Interruption of 'heavy query' leads to 0 ms (zero duration) in it`s statistics in trace log

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:26481 FORMAL BUILD NUMBER:26482
*/ */
#define PRODUCT_VER_STRING "2.5.2.26481" #define PRODUCT_VER_STRING "2.5.2.26482"
#define FILE_VER_STRING "WI-V2.5.2.26481" #define FILE_VER_STRING "WI-V2.5.2.26482"
#define LICENSE_VER_STRING "WI-V2.5.2.26481" #define LICENSE_VER_STRING "WI-V2.5.2.26482"
#define FILE_VER_NUMBER 2, 5, 2, 26481 #define FILE_VER_NUMBER 2, 5, 2, 26482
#define FB_MAJOR_VER "2" #define FB_MAJOR_VER "2"
#define FB_MINOR_VER "5" #define FB_MINOR_VER "5"
#define FB_REV_NO "2" #define FB_REV_NO "2"
#define FB_BUILD_NO "26481" #define FB_BUILD_NO "26482"
#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=2 RevNo=2
BuildNum=26481 BuildNum=26482
if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
# Normal builds # Normal builds