From af9cd08f833f2483e08e6cf348281a8b5d58bcdd Mon Sep 17 00:00:00 2001
From: firebirds <firebirds@65644016-39b1-43b1-bf79-96bc8fe82c15>
Date: Sat, 30 Jan 2016 00:08:47 +0000
Subject: [PATCH] nightly update

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

diff --git a/ChangeLog b/ChangeLog
index 4c130fe674..e6723f96c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+ 2016-01-29 15:46  alexpeshkoff 
+   M src/jrd/CryptoManager.cpp
+   M src/jrd/CryptoManager.h
+Simplified code - thanks to Vlad
+
+ 2016-01-29 14:51  asfernandes 
+   M src/isql/extract.epp
+Fixed CORE-5089 - Metadata extration (ISQL -X): "CREATE PROCEDURE/FUNCTION"  statement contains reference to column of table(s) that not yet exists if this procedure had parameter of such type when it was created.
+
+ 2016-01-29 14:12  alexpeshkoff 
+   M src/jrd/CryptoManager.cpp
+   M src/jrd/CryptoManager.h
+Fixed regression in CryptoManager added after RC1 - avoid reading incorrect header when database is locked by nbackup
+
  2016-01-28 17:00  alexpeshkoff 
    M src/yvalve/MasterImplementation.cpp
 Fixed CORE-5088: Segfault when 'gstat -h' is closing
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index f5cdc6b07c..1c6816ede1 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:32297
+  FORMAL BUILD NUMBER:32300
 */
 
-#define PRODUCT_VER_STRING "3.0.0.32297"
-#define FILE_VER_STRING "WI-V3.0.0.32297"
-#define LICENSE_VER_STRING "WI-V3.0.0.32297"
-#define FILE_VER_NUMBER 3, 0, 0, 32297
+#define PRODUCT_VER_STRING "3.0.0.32300"
+#define FILE_VER_STRING "WI-V3.0.0.32300"
+#define LICENSE_VER_STRING "WI-V3.0.0.32300"
+#define FILE_VER_NUMBER 3, 0, 0, 32300
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "32297"
+#define FB_BUILD_NO "32300"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 2"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index c6d6c95418..6f5d76601d 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=32297
+BuildNum=32300
 
 NowAt=`pwd`
 cd `dirname $0`