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

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

Revision: 61300
          http://sourceforge.net/p/firebird/code/61300
Author:   firebirds
Date:     2015-04-13 17:02:22 +0000 (Mon, 13 Apr 2015)
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	2015-04-13 12:54:41 UTC (rev 61299)
+++ firebird/trunk/ChangeLog	2015-04-13 17:02:22 UTC (rev 61300)
@@ -1,3 +1,7 @@
+ 2015-04-12 21:05  asfernandes 
+   M src/lock/print.cpp
+Revert "Remove duplicate lck enums." - broke Windows build as per Dmitry.
+
  2015-04-11 00:59  asfernandes 
    M src/dsql/DdlNodes.epp
 Fixed CORE-4744 - ALTER DATABASE SET DEFAULT CHARACTER SET: 1) take effect only for once for current attachment; 2) does not check that new char set exists untill it will be used.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-04-13 12:54:41 UTC (rev 61299)
+++ firebird/trunk/src/jrd/build_no.h	2015-04-13 17:02:22 UTC (rev 61300)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31784
+  FORMAL BUILD NUMBER:31785
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31784"
-#define FILE_VER_STRING "WI-T3.0.0.31784"
-#define LICENSE_VER_STRING "WI-T3.0.0.31784"
-#define FILE_VER_NUMBER 3, 0, 0, 31784
+#define PRODUCT_VER_STRING "3.0.0.31785"
+#define FILE_VER_STRING "WI-T3.0.0.31785"
+#define LICENSE_VER_STRING "WI-T3.0.0.31785"
+#define FILE_VER_NUMBER 3, 0, 0, 31785
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31784"
+#define FB_BUILD_NO "31785"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-04-13 12:54:41 UTC (rev 61299)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-04-13 17:02:22 UTC (rev 61300)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31784
+BuildNum=31785
 
 NowAt=`pwd`
 cd `dirname $0`

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