From b9650963700ec97a523b552625ddcf8bc05b9e68 Mon Sep 17 00:00:00 2001
From: firebirds <firebirds@65644016-39b1-43b1-bf79-96bc8fe82c15>
Date: Thu, 5 Mar 2015 00:28:15 +0000
Subject: [PATCH] nightly update

---
 ChangeLog                 | 38 ++++++++++++++++++++++++++++++++++++++
 src/jrd/build_no.h        | 12 ++++++------
 src/misc/writeBuildNum.sh |  2 +-
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index abed0e14bf..dc6165ac3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+ 2015-03-04 19:29  egorpugin 
+   M CMakeLists.txt
+[build][cmake] Add compiler switch '/MT(d)' for MSVC. Use '-DMSVC_STATIC_RUNTIME=1' parameter during cmake call to turn on static runtime linking.
+
+ 2015-03-04 17:58  dimitr 
+   M src/burp/restore.epp
+Fixed CORE-4704: Generator/exception permissions get corrupted after backup/restore.
+
+ 2015-03-04 16:18  alexpeshkoff 
+   M src/dsql/dsql.cpp
+   M src/dsql/dsql.h
+   M src/jrd/EngineInterface.h
+   M src/jrd/JrdStatement.cpp
+   M src/jrd/JrdStatement.h
+   M src/jrd/jrd.cpp
+   M src/jrd/jrd_proto.h
+   M src/jrd/svc.cpp
+   M src/jrd/svc.h
+Full fix for CORE-4698, also fixed some more or less related leaks, segfaults and assertions
+
+ 2015-03-04 16:01  alexpeshkoff 
+   M src/common/classes/RefMutex.h
+Perform non-atomic counter operations under locked mutex
+
+ 2015-03-04 15:21  asfernandes 
+   M src/include/firebird/UdrCppEngine.h
+Correction.
+
+ 2015-03-04 10:49  hvlad 
+   M src/yvalve/MasterImplementation.cpp
+Fixed rare deadlock (take cleanupMutex before StringsBuffer::mutex)
+
+ 2015-03-04 10:37  hvlad 
+   M src/jrd/btr.cpp
+   M src/jrd/pcmet.epp
+Additional patch for CORE-4671 : Release internal temporary blobs early to free some memory\disk space
+The patch fixed AV when expression indices with blob-based expression is built (see CORE-952, for example)
+
  2015-02-27 16:01  alexpeshkoff 
    M src/common/classes/vector.h
 Most of methods of vector never throw
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 63c92ded4f..ad59e17916 100644
--- a/src/jrd/build_no.h
+++ b/src/jrd/build_no.h
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31690
+  FORMAL BUILD NUMBER:31697
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31690"
-#define FILE_VER_STRING "WI-T3.0.0.31690"
-#define LICENSE_VER_STRING "WI-T3.0.0.31690"
-#define FILE_VER_NUMBER 3, 0, 0, 31690
+#define PRODUCT_VER_STRING "3.0.0.31697"
+#define FILE_VER_STRING "WI-T3.0.0.31697"
+#define LICENSE_VER_STRING "WI-T3.0.0.31697"
+#define FILE_VER_NUMBER 3, 0, 0, 31697
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31690"
+#define FB_BUILD_NO "31697"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index 66400844d0..7bb6d46072 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=T
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31690
+BuildNum=31697
 
 NowAt=`pwd`
 cd `dirname $0`