From 87fe254d2dbca4221cdadc72d348c5e4f0199ad3 Mon Sep 17 00:00:00 2001
From: firebirds <firebirds@65644016-39b1-43b1-bf79-96bc8fe82c15>
Date: Mon, 17 Aug 2015 00:08:28 +0000
Subject: [PATCH] nightly update

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

diff --git a/ChangeLog b/ChangeLog
index 7384df6b46..551b19c1ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+ 2015-08-16 15:47  dimitr 
+   M src/jrd/recsrc/HashJoin.cpp
+Fixed the hash-join part of CORE-4909: MERGE / HASH JOINs produce incorrect results when VARCHAR join keys differ only by trailing spaces.
+
+ 2015-08-16 13:53  asfernandes 
+   M src/jrd/btr.cpp
+   M src/jrd/validation.cpp
+   M src/utilities/ntrace/TracePluginImpl.cpp
+   M src/utilities/ntrace/TracePluginImpl.h
+Misc.
+
  2015-08-14 14:41  alexpeshkoff 
    M src/jrd/svc.cpp
 Fixed CORE-4897: FBSVCMGR can produce broken log when restoring database
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 45c432a68e..2bf3986411 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:31999
+  FORMAL BUILD NUMBER:32001
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31999"
-#define FILE_VER_STRING "WI-V3.0.0.31999"
-#define LICENSE_VER_STRING "WI-V3.0.0.31999"
-#define FILE_VER_NUMBER 3, 0, 0, 31999
+#define PRODUCT_VER_STRING "3.0.0.32001"
+#define FILE_VER_STRING "WI-V3.0.0.32001"
+#define LICENSE_VER_STRING "WI-V3.0.0.32001"
+#define FILE_VER_NUMBER 3, 0, 0, 32001
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31999"
+#define FB_BUILD_NO "32001"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index ee678f9bec..33f68f2723 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31999
+BuildNum=32001
 
 NowAt=`pwd`
 cd `dirname $0`