[Firebird-checkins] SF.net SVN: firebird:[62868] firebird/trunk

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

Revision: 62868
          http://sourceforge.net/p/firebird/code/62868
Author:   firebirds
Date:     2016-01-28 00:10:41 +0000 (Thu, 28 Jan 2016)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2016-01-27 17:35:00 UTC (rev 62867)
+++ firebird/trunk/ChangeLog	2016-01-28 00:10:41 UTC (rev 62868)
@@ -1,3 +1,17 @@
+ 2016-01-27 11:11  hvlad 
+   M src/jrd/btr.cpp
+   M src/jrd/btr.h
+   M src/jrd/idx.cpp
+   M src/jrd/lck.cpp
+   M src/jrd/lck.h
+   M src/jrd/ods.h
+   M src/jrd/validation.cpp
+   M src/utilities/gstat/dba.epp
+Remove LCK_idx_reserve introduced with 64-bit transaction ID. 
+Restore original logic in BTR_next_index (wait for tx lock when index build is in progress). 
+Use irt_repeat::irt_root to store high 32 bit of tra_num. 
+It also fixed deadlock related with LCK_idx_reserve lock (reported privately).
+
  2016-01-25 18:34  alexpeshkoff 
    A examples/interfaces/05.user_metadata.cpp
    M src/include/firebird/FirebirdInterface.idl

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2016-01-27 17:35:00 UTC (rev 62867)
+++ firebird/trunk/src/jrd/build_no.h	2016-01-28 00:10:41 UTC (rev 62868)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:32294
+  FORMAL BUILD NUMBER:32295
 */
 
-#define PRODUCT_VER_STRING "3.0.0.32294"
-#define FILE_VER_STRING "WI-V3.0.0.32294"
-#define LICENSE_VER_STRING "WI-V3.0.0.32294"
-#define FILE_VER_NUMBER 3, 0, 0, 32294
+#define PRODUCT_VER_STRING "3.0.0.32295"
+#define FILE_VER_STRING "WI-V3.0.0.32295"
+#define LICENSE_VER_STRING "WI-V3.0.0.32295"
+#define FILE_VER_NUMBER 3, 0, 0, 32295
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "32294"
+#define FB_BUILD_NO "32295"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2016-01-27 17:35:00 UTC (rev 62867)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2016-01-28 00:10:41 UTC (rev 62868)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=32294
+BuildNum=32295
 
 NowAt=`pwd`
 cd `dirname $0`

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