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

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

Revision: 62640
          http://sourceforge.net/p/firebird/code/62640
Author:   firebirds
Date:     2015-12-10 00:10:27 +0000 (Thu, 10 Dec 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-12-09 14:22:13 UTC (rev 62639)
+++ firebird/trunk/ChangeLog	2015-12-10 00:10:27 UTC (rev 62640)
@@ -1,3 +1,21 @@
+ 2015-12-09 14:22  aafemt 
+   M src/dsql/DdlNodes.epp
+   M src/jrd/CryptoManager.cpp
+   M src/jrd/CryptoManager.h
+Perform db encryption checks at ddl time to avoid corrupting database by wrong plugin name in header
+
+ 2015-12-09 13:47  aafemt 
+   M src/dsql/DdlNodes.epp
+   M src/dsql/DdlNodes.h
+   M src/dsql/Parser.h
+   M src/dsql/parse.y
+Prevent using DECRYPT and ENCRYPT clauses in one query
+
+ 2015-12-09 10:25  paul_reeves 
+   M builds/install/arch-specific/win32/ru/custom_messages_ru.inc
+Change file format of custom messages to UTF-8
+This ought to fix CORE-5002 but needs further testing
+
  2015-12-06 22:49  asfernandes 
    M src/common/isc_sync.cpp
    M src/jrd/validation.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-12-09 14:22:13 UTC (rev 62639)
+++ firebird/trunk/src/jrd/build_no.h	2015-12-10 00:10:27 UTC (rev 62640)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:32208
+  FORMAL BUILD NUMBER:32211
 */
 
-#define PRODUCT_VER_STRING "3.0.0.32208"
-#define FILE_VER_STRING "WI-V3.0.0.32208"
-#define LICENSE_VER_STRING "WI-V3.0.0.32208"
-#define FILE_VER_NUMBER 3, 0, 0, 32208
+#define PRODUCT_VER_STRING "3.0.0.32211"
+#define FILE_VER_STRING "WI-V3.0.0.32211"
+#define LICENSE_VER_STRING "WI-V3.0.0.32211"
+#define FILE_VER_NUMBER 3, 0, 0, 32211
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "32208"
+#define FB_BUILD_NO "32211"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-12-09 14:22:13 UTC (rev 62639)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-12-10 00:10:27 UTC (rev 62640)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=32208
+BuildNum=32211
 
 NowAt=`pwd`
 cd `dirname $0`

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