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

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

Revision: 62440
          http://sourceforge.net/p/firebird/code/62440
Author:   firebirds
Date:     2015-10-28 00:14:10 +0000 (Wed, 28 Oct 2015)
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	2015-10-28 00:09:12 UTC (rev 62439)
+++ firebird/branches/B2_5_Release/ChangeLog	2015-10-28 00:14:10 UTC (rev 62440)
@@ -1,3 +1,42 @@
+ 2015-10-27 11:23  hvlad 
+   M src/burp/backup.epp
+Forward compatibility with ODS12 - don't put into backup relation constraints of system relations (which was introduced by ODS12).
+It allows to backup fb3 database using gbak v2.5 and later restore such backup by v3 engine.
+
+ 2015-10-27 11:20  hvlad 
+   M src/burp/backup.epp
+   M src/burp/burp.cpp
+   M src/burp/burp.h
+   M src/burp/burpswi.h
+   M src/burp/restore.epp
+   M src/common/classes/ClumpletReader.cpp
+   M src/include/consts_pub.h
+   M src/jrd/svc.cpp
+   M src/jrd/svc.h
+   M src/msgs/facilities2.sql
+   M src/msgs/messages2.sql
+   M src/utilities/fbsvcmgr.cpp
+Backport feature CORE-1999 : TimeStamp in the every line output gbak.exe utility
+
+ 2015-10-27 10:27  hvlad 
+   M src/remote/server.cpp
+Backport from trunk: avoid send over closing socket (it put errors 10058 (WSAESHUTDOWN) in firebird.log)
+
+ 2015-10-27 10:20  hvlad 
+   M src/remote/interface.cpp
+Backport from trunk: mark port as disconnecting to avoid reporting (expected) network errors
+
+ 2015-10-27 10:06  hvlad 
+   M src/remote/inet.cpp
+Backport fix for bug CORE-4680 : Possible deadlock in firebird connect.
+
+ 2015-10-27 08:38  roman-simakov 
+   M src/jrd/cch.cpp
+   M src/jrd/inf.cpp
+   M src/jrd/jrd.h
+   M src/jrd/validation.cpp
+Fidex CORE-4978: Improved validation and fix of lost data pages
+
  2015-10-14 12:46  paulbeach 
    M builds/install/arch-specific/darwin/install-script
    M builds/install/arch-specific/darwin/preupgrade-script

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-10-28 00:09:12 UTC (rev 62439)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2015-10-28 00:14:10 UTC (rev 62440)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26942
+  FORMAL BUILD NUMBER:26948
 */
 
-#define PRODUCT_VER_STRING "2.5.5.26942"
-#define FILE_VER_STRING "WI-V2.5.5.26942"
-#define LICENSE_VER_STRING "WI-V2.5.5.26942"
-#define FILE_VER_NUMBER 2, 5, 5, 26942
+#define PRODUCT_VER_STRING "2.5.5.26948"
+#define FILE_VER_STRING "WI-V2.5.5.26948"
+#define LICENSE_VER_STRING "WI-V2.5.5.26948"
+#define FILE_VER_NUMBER 2, 5, 5, 26948
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "5"
-#define FB_BUILD_NO "26942"
+#define FB_BUILD_NO "26948"
 #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	2015-10-28 00:09:12 UTC (rev 62439)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2015-10-28 00:14:10 UTC (rev 62440)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=5
-BuildNum=26942
+BuildNum=26948
 
 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.