nightly update

ChangeLog

@@ -1,3 +1,14 @@
+ 2011-12-19 16:01  hvlad 
+   M src/common/classes/init.cpp
+   M src/jrd/gds.cpp
+   M src/jrd/jrd.cpp
+   M src/jrd/why.cpp
+Fixed bug CORE-3671 : JVM Access Violation when using Firebird Embedded
+
+ 2011-12-19 09:59  dimitr 
+   M src/jrd/opt.cpp
+Backported CORE-3683: Wrong results if the recursive query contains an embedded GROUP BY clause.
+
  2011-12-14 16:08  dimitr 
    M src/dsql/gen.cpp
 Fixed (methinks) CORE-3697: String truncation error when selecting from a VIEW with UNION inside. It doesn't look like a good idea to modify dsc_length in place, as it can be used afterwards (e.g. MAKE_desc(field) after GEN_expr(rse), see define_view() in ddl.cpp). We only need to ensure that the generated BLR has the real byte length and it can be achieved with a temporary descriptor copy. Other solutions are also possible but this one seems better at the first glance.

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:26399
+  FORMAL BUILD NUMBER:26401
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26399"
-#define FILE_VER_STRING "WI-V2.5.2.26399"
-#define LICENSE_VER_STRING "WI-V2.5.2.26399"
-#define FILE_VER_NUMBER 2, 5, 2, 26399
+#define PRODUCT_VER_STRING "2.5.2.26401"
+#define FILE_VER_STRING "WI-V2.5.2.26401"
+#define LICENSE_VER_STRING "WI-V2.5.2.26401"
+#define FILE_VER_NUMBER 2, 5, 2, 26401
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26399"
+#define FB_BUILD_NO "26401"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5"

src/misc/writeBuildNum.sh

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