[Firebird-checkins] SF.net SVN: firebird:[58406] firebird/branches/B2_5_Release

[<fir...@us...>]

Revision: 58406
          http://sourceforge.net/p/firebird/code/58406
Author:   firebirds
Date:     2013-07-23 01:39:01 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
nightly update

Modified Paths:
--------------
    firebird/branches/B2_5_Release/ChangeLog
    firebird/branches/B2_5_Release/src/jrd/build_no.h
    firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh

Modified: firebird/branches/B2_5_Release/ChangeLog
===================================================================
--- firebird/branches/B2_5_Release/ChangeLog	2013-07-23 01:11:15 UTC (rev 58405)
+++ firebird/branches/B2_5_Release/ChangeLog	2013-07-23 01:39:01 UTC (rev 58406)
@@ -1,3 +1,20 @@
+ 2013-07-22 16:20  dimitr 
+   M doc/WhatsNew
+Updated the docs.
+
+ 2013-07-22 16:18  dimitr 
+   M doc/WhatsNew
+Updated the docs.
+
+ 2013-07-22 07:47  hvlad 
+   M src/dsql/gen.cpp
+Fixed bug CORE-4144 : Error "context already in use (BLR error)" when preparing a query with UNION 
+
+ 2013-07-22 07:36  alexpeshkoff 
+   M builds/posix/Makefile.in.examples
+   M builds/posix/Makefile.in.firebird
+Patch from LO
+
  2013-07-19 08:42  hvlad 
    M src/dsql/dsql.h
    M src/dsql/pass1.cpp

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2013-07-23 01:11:15 UTC (rev 58405)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2013-07-23 01:39:01 UTC (rev 58406)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26678
+  FORMAL BUILD NUMBER:26682
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26678"
-#define FILE_VER_STRING "WI-V2.5.3.26678"
-#define LICENSE_VER_STRING "WI-V2.5.3.26678"
-#define FILE_VER_NUMBER 2, 5, 3, 26678
+#define PRODUCT_VER_STRING "2.5.3.26682"
+#define FILE_VER_STRING "WI-V2.5.3.26682"
+#define LICENSE_VER_STRING "WI-V2.5.3.26682"
+#define FILE_VER_NUMBER 2, 5, 3, 26682
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26678"
+#define FB_BUILD_NO "26682"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5"

Modified: firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh
===================================================================
--- firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2013-07-23 01:11:15 UTC (rev 58405)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2013-07-23 01:39:01 UTC (rev 58406)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26678
+BuildNum=26682
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.