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

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

Revision: 60323
          http://sourceforge.net/p/firebird/code/60323
Author:   firebirds
Date:     2014-12-02 15:41:03 +0000 (Tue, 02 Dec 2014)
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	2014-12-02 10:18:26 UTC (rev 60322)
+++ firebird/branches/B2_5_Release/ChangeLog	2014-12-02 15:41:03 UTC (rev 60323)
@@ -1,3 +1,30 @@
+ 2014-11-30 15:50  dimitr 
+   M src/jrd/vio.cpp
+Simplest possible fix for CORE-4618: Rollback doesn`t undo changes when MERGE statement updates the same target rows multiple times and PLAN MERGE is used.
+
+ 2014-11-30 14:56  hvlad 
+   M src/jrd/jrd.cpp
+Fixed bug CORE-4627 : Deadlock with TIP page lock and monitoring lock
+
+ 2014-11-24 15:58  mkubecek 
+   M configure.in
+Fix libdir on s390x (S/390-64) Linux
+
+ 2014-11-21 11:30  dimitr 
+   M src/jrd/functions.cpp
+Fixed CORE-4616: Server crashes while accessing context variables concurrently.
+
+ 2014-11-21 09:47  dimitr 
+   M src/jrd/build_no.h
+   M src/misc/writeBuildNum.sh
+Bumped the snapshot version number.
+
+ 2014-11-20 22:56  hvlad 
+   M src/jrd/Database.h
+   M src/jrd/os/posix/unix.cpp
+   M src/jrd/os/win32/winnt.cpp
+Fixed bug CORE-4615 : Classic Server could hung with (near) 100% CPU load
+
  2014-11-17 11:48  mkubecek 
    M builds/install/arch-specific/aix/misc/aixLibrary.sh.in
    M builds/install/arch-specific/freebsd/freebsdLibrary.sh.in

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2014-12-02 10:18:26 UTC (rev 60322)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2014-12-02 15:41:03 UTC (rev 60323)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26812
+  FORMAL BUILD NUMBER:26818
 */
 
-#define PRODUCT_VER_STRING "2.5.4.26812"
-#define FILE_VER_STRING "WI-V2.5.4.26812"
-#define LICENSE_VER_STRING "WI-V2.5.4.26812"
-#define FILE_VER_NUMBER 2, 5, 4, 26812
+#define PRODUCT_VER_STRING "2.5.4.26818"
+#define FILE_VER_STRING "WI-V2.5.4.26818"
+#define LICENSE_VER_STRING "WI-V2.5.4.26818"
+#define FILE_VER_NUMBER 2, 5, 4, 26818
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "4"
-#define FB_BUILD_NO "26812"
+#define FB_BUILD_NO "26818"
 #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	2014-12-02 10:18:26 UTC (rev 60322)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2014-12-02 15:41:03 UTC (rev 60323)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=4
-BuildNum=26812
+BuildNum=26818
 
 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.