nightly update

FirebirdSQL · Dec 6, 2011 · 5c980cb · 5c980cb
1 parent 58ec672
commit 5c980cb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+ 2011-12-05 13:52  hvlad 
+   M src/dsql/dsql.cpp
+Fixed bug CORE-3680 : EXECUTE BLOCK statement and ISC_DSQL_EXECUTE2() problem
+
+ 2011-12-05 13:08  hvlad 
+   M src/dsql/pass1.cpp
+Fixed bug CORE-3690 : Wrong warning message for ambiguous query
+
  2011-12-01 09:52  dimitr 
    M src/jrd/exe.cpp
 For a number of reasons, it seems being a good thing to unwind the trigger requests ASAP.

diff --git 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:26392
+  FORMAL BUILD NUMBER:26394
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26392"
-#define FILE_VER_STRING "WI-V2.5.2.26392"
-#define LICENSE_VER_STRING "WI-V2.5.2.26392"
-#define FILE_VER_NUMBER 2, 5, 2, 26392
+#define PRODUCT_VER_STRING "2.5.2.26394"
+#define FILE_VER_STRING "WI-V2.5.2.26394"
+#define LICENSE_VER_STRING "WI-V2.5.2.26394"
+#define FILE_VER_NUMBER 2, 5, 2, 26394
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26392"
+#define FB_BUILD_NO "26394"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26392
+BuildNum=26394
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds