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

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

Revision: 53506
          http://firebird.svn.sourceforge.net/firebird/?rev=53506&view=rev
Author:   firebirds
Date:     2011-10-04 03:20:16 +0000 (Tue, 04 Oct 2011)
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	2011-10-03 15:52:14 UTC (rev 53505)
+++ firebird/trunk/ChangeLog	2011-10-04 03:20:16 UTC (rev 53506)
@@ -1,3 +1,17 @@
+ 2011-10-03 15:52  asfernandes 
+   M src/dsql/StmtNodes.cpp
+Mark sub procedure scratch as a procedure.
+
+ 2011-10-03 15:35  asfernandes 
+   M src/dsql/pass1.cpp
+This check appears to do nothing good. Let the error always be thrown in DSQL.
+
+ 2011-10-03 11:27  hvlad 
+   M src/jrd/idx.cpp
+   M src/jrd/vio.cpp
+Return explicit sign of active transaction from VIO_get_current() - it makes logic more clear in check_duplicates() and allows to clear transient lock error from status vector and not propagate up to the callers. 
+Cleanup : removed my old disabled code (checking for old and new values) and restored original code in check_duplicates().
+
  2011-10-02 22:11  asfernandes 
    M src/common/classes/alloc.h
    M src/dsql/BlrWriter.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2011-10-03 15:52:14 UTC (rev 53505)
+++ firebird/trunk/src/jrd/build_no.h	2011-10-04 03:20:16 UTC (rev 53506)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:29557
+  FORMAL BUILD NUMBER:29560
 */
 
-#define PRODUCT_VER_STRING "3.0.0.29557"
-#define FILE_VER_STRING "WI-T3.0.0.29557"
-#define LICENSE_VER_STRING "WI-T3.0.0.29557"
-#define FILE_VER_NUMBER 3, 0, 0, 29557
+#define PRODUCT_VER_STRING "3.0.0.29560"
+#define FILE_VER_STRING "WI-T3.0.0.29560"
+#define LICENSE_VER_STRING "WI-T3.0.0.29560"
+#define FILE_VER_NUMBER 3, 0, 0, 29560
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "29557"
+#define FB_BUILD_NO "29560"
 #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	2011-10-03 15:52:14 UTC (rev 53505)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2011-10-04 03:20:16 UTC (rev 53506)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=29557
+BuildNum=29560
 
 NowAt=`pwd`
 cd `dirname $0`

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