From b66fb567fd4c5d392331bd7a57cbca3ab10f5d5c Mon Sep 17 00:00:00 2001
From: firebirds <firebirds@65644016-39b1-43b1-bf79-96bc8fe82c15>
Date: Wed, 21 Nov 2012 04:21:01 +0000
Subject: [PATCH] nightly update

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

diff --git a/ChangeLog b/ChangeLog
index b07659cd4a..99b8bce181 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+ 2012-11-20 12:23  hvlad 
+   M src/jrd/vio.cpp
+Make sure relation's flags are loaded from disk before analyze them
+
+ 2012-11-20 10:15  dimitr 
+   M src/jrd/cmp.cpp
+Additional fixes for CORE-3981 (Sub-optimal predicate checking while selecting from a view) that also resolve the regression CORE-3986 (GSEC couldn't change user password after fix for CORE-3981).
+
+ 2012-11-20 09:32  hvlad 
+   M src/jrd/trace/TraceJrdHelpers.h
+FIxed bug CORE-3988 : Engine crashed when trace or audit is active
+
  2012-11-19 08:41  hvlad 
    M src/jrd/trace/TraceLog.cpp
 Make previous fix for CORE-3969 platform independent.
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 6fa55ae8b7..8266702f4f 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:26560
+  FORMAL BUILD NUMBER:26563
 */
 
-#define PRODUCT_VER_STRING "2.5.3.26560"
-#define FILE_VER_STRING "WI-V2.5.3.26560"
-#define LICENSE_VER_STRING "WI-V2.5.3.26560"
-#define FILE_VER_NUMBER 2, 5, 3, 26560
+#define PRODUCT_VER_STRING "2.5.3.26563"
+#define FILE_VER_STRING "WI-V2.5.3.26563"
+#define LICENSE_VER_STRING "WI-V2.5.3.26563"
+#define FILE_VER_NUMBER 2, 5, 3, 26563
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "3"
-#define FB_BUILD_NO "26560"
+#define FB_BUILD_NO "26563"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.5"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index a469f74327..ccb223618b 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=3
-BuildNum=26560
+BuildNum=26563
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds