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

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

Revision: 54007
          http://firebird.svn.sourceforge.net/firebird/?rev=54007&view=rev
Author:   firebirds
Date:     2012-02-14 04:49:10 +0000 (Tue, 14 Feb 2012)
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	2012-02-13 15:39:51 UTC (rev 54006)
+++ firebird/trunk/ChangeLog	2012-02-14 04:49:10 UTC (rev 54007)
@@ -1,3 +1,9 @@
+ 2012-02-13 15:39  dimitr 
+   M src/lock/lock.cpp
+   M src/lock/lock_proto.h
+Attempted to fix a lock validation bug which ignored a situation where an incompatible request was changed from LRQ_pending to LRQ_rejected but temporarily remained in the queue.
+A few other misc changes.
+
  2012-02-12 14:54  mapopa 
    M src/include/fb_types.h
 comment cleanup  STEXT and UTEXT not used anywhere

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2012-02-13 15:39:51 UTC (rev 54006)
+++ firebird/trunk/src/jrd/build_no.h	2012-02-14 04:49:10 UTC (rev 54007)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:29779
+  FORMAL BUILD NUMBER:29780
 */
 
-#define PRODUCT_VER_STRING "3.0.0.29779"
-#define FILE_VER_STRING "WI-T3.0.0.29779"
-#define LICENSE_VER_STRING "WI-T3.0.0.29779"
-#define FILE_VER_NUMBER 3, 0, 0, 29779
+#define PRODUCT_VER_STRING "3.0.0.29780"
+#define FILE_VER_STRING "WI-T3.0.0.29780"
+#define LICENSE_VER_STRING "WI-T3.0.0.29780"
+#define FILE_VER_NUMBER 3, 0, 0, 29780
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "29779"
+#define FB_BUILD_NO "29780"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2012-02-13 15:39:51 UTC (rev 54006)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2012-02-14 04:49:10 UTC (rev 54007)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=29779
+BuildNum=29780
 
 NowAt=`pwd`
 cd `dirname $0`

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