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

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

Revision: 54444
          http://firebird.svn.sourceforge.net/firebird/?rev=54444&view=rev
Author:   firebirds
Date:     2012-05-04 04:59:17 +0000 (Fri, 04 May 2012)
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	2012-05-04 04:50:17 UTC (rev 54443)
+++ firebird/branches/B2_5_Release/ChangeLog	2012-05-04 04:59:17 UTC (rev 54444)
@@ -1,3 +1,39 @@
+ 2012-05-03 21:24  hvlad 
+   M src/utilities/ntrace/TracePluginImpl.cpp
+Removed accidentally committed code.
+
+ 2012-05-03 13:48  hvlad 
+   M src/jrd/cch.cpp
+   M src/jrd/nbak.cpp
+   M src/jrd/nbak.h
+Fixed bug CORE-3814 : SuperClassic server crashes when performing a database shutdown (FW=OFF)
+
+ 2012-05-03 11:11  hvlad 
+   M src/jrd/jrd.cpp
+   M src/jrd/tra.cpp
+   M src/jrd/tra_proto.h
+Improvement CORE-3598 : TRACE: add statistics of actions that were after transaction finished
+
+ 2012-05-02 21:42  hvlad 
+   M src/jrd/jrd.cpp
+Trace errors raised by failed ON TRANSACTION ROLLBACK and ON DISCONNECT triggers.
+
+ 2012-05-02 20:53  hvlad 
+   M src/jrd/jrd.cpp
+   M src/jrd/ntrace.h
+   M src/jrd/svc.cpp
+   M src/jrd/trace/TraceDSQLHelpers.h
+   M src/jrd/trace/TraceManager.cpp
+   M src/jrd/trace/TraceManager.h
+   M src/jrd/trace/TraceObjects.cpp
+   M src/jrd/trace/TraceObjects.h
+   M src/utilities/ntrace/TracePluginImpl.cpp
+   M src/utilities/ntrace/TracePluginImpl.h
+   M src/utilities/ntrace/fbtrace.conf
+   M src/utilities/ntrace/paramtable.h
+   M src/utilities/ntrace/traceplugin.cpp
+Improvement CORE-3539 : TRACE: add ability for logging ERRORs that occur in runtime (lock conflicts, PK/UK/FK violations et al)
+
  2012-04-27 16:31  dimitr 
    M src/dsql/pass1.cpp
 Fixed CORE-3834: Usage of a NATURAL JOIN with a derived table crashes the server.

Modified: firebird/branches/B2_5_Release/src/jrd/build_no.h
===================================================================
--- firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-05-04 04:50:17 UTC (rev 54443)
+++ firebird/branches/B2_5_Release/src/jrd/build_no.h	2012-05-04 04:59:17 UTC (rev 54444)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:26472
+  FORMAL BUILD NUMBER:26477
 */
 
-#define PRODUCT_VER_STRING "2.5.2.26472"
-#define FILE_VER_STRING "WI-V2.5.2.26472"
-#define LICENSE_VER_STRING "WI-V2.5.2.26472"
-#define FILE_VER_NUMBER 2, 5, 2, 26472
+#define PRODUCT_VER_STRING "2.5.2.26477"
+#define FILE_VER_STRING "WI-V2.5.2.26477"
+#define LICENSE_VER_STRING "WI-V2.5.2.26477"
+#define FILE_VER_NUMBER 2, 5, 2, 26477
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "2"
-#define FB_BUILD_NO "26472"
+#define FB_BUILD_NO "26477"
 #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	2012-05-04 04:50:17 UTC (rev 54443)
+++ firebird/branches/B2_5_Release/src/misc/writeBuildNum.sh	2012-05-04 04:59:17 UTC (rev 54444)
@@ -9,7 +9,7 @@
 MajorVer=2
 MinorVer=5
 RevNo=2
-BuildNum=26472
+BuildNum=26477
 
 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.