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

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

Revision: 52556
          http://firebird.svn.sourceforge.net/firebird/?rev=52556&view=rev
Author:   firebirds
Date:     2011-03-18 03:22:22 +0000 (Fri, 18 Mar 2011)

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	2011-03-18 03:15:44 UTC (rev 52555)
+++ firebird/branches/B2_5_Release/ChangeLog	2011-03-18 03:22:22 UTC (rev 52556)
@@ -1,3 +1,8 @@
+ 2011-03-17 11:17  hvlad 
+   M src/jrd/idx.cpp
+Fixed bug CORE-3394 : Failed attempt to violate unique constraint could leave unneeded "lock conflict" error in status-vector.
+Backported more conservative version of patch
+
  2011-03-16 20:44  hvlad 
    M src/dsql/dsql.cpp
 Fixed bug CORE-3389 : isc_dsql_exec_immed2 with zero transaction handle could lead to a BUGCHECK(147)

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-03-18 03:15:44 UTC (rev 52555)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2011-03-18 03:22:22 UTC (rev 52556)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26238
+  FORMAL BUILD NUMBER:26239
 */
 
-#define PRODUCT_VER_STRING "2.5.1.26238"
-#define FILE_VER_STRING "WI-V2.5.1.26238"
-#define LICENSE_VER_STRING "WI-V2.5.1.26238"
-#define FILE_VER_NUMBER 2, 5, 1, 26238
+#define PRODUCT_VER_STRING "2.5.1.26239"
+#define FILE_VER_STRING "WI-V2.5.1.26239"
+#define LICENSE_VER_STRING "WI-V2.5.1.26239"
+#define FILE_VER_NUMBER 2, 5, 1, 26239
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "1"
-#define FB_BUILD_NO "26238"
+#define FB_BUILD_NO "26239"
 #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	2011-03-18 03:15:44 UTC (rev 52555)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2011-03-18 03:22:22 UTC (rev 52556)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=1
-BuildNum=26238
+BuildNum=26239
 
 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.