From 66b4b413dae0cde848c645ae47c594ca1ad0ecc3 Mon Sep 17 00:00:00 2001
From: firebirds <firebirds@65644016-39b1-43b1-bf79-96bc8fe82c15>
Date: Thu, 14 Oct 2010 03:18:41 +0000
Subject: [PATCH] nightly update

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

diff --git a/ChangeLog b/ChangeLog
index 55025ac32a..ec1ce3ce5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+ 2010-10-13 12:47  alexpeshkoff 
+   M builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
+   M configure.in
+Fixed CORE-3166: Script changeMultiConnectMode.sh should not be present in SS environment
+
+ 2010-10-13 12:11  dimitr 
+   M src/jrd/blb.cpp
+   M src/jrd/cmp.cpp
+   M src/jrd/cmp_proto.h
+   M src/jrd/dfw.epp
+   M src/jrd/irq.h
+   M src/jrd/met.epp
+   M src/jrd/met_proto.h
+   M src/jrd/par.cpp
+   M src/jrd/scl.epp
+   M src/jrd/scl.h
+   M src/jrd/scl_proto.h
+   M src/jrd/vio.cpp
+Fixed the major part of the slowdown in CORE-2827: Very slow prepare for complex interrelated metadata with many triggers indirectly involved in the operation being prepared.
+Code cleanup.
+
  2010-10-08 11:58  hvlad 
    M src/jrd/dfw.epp
    M src/jrd/event.cpp
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index eaab19e98c..879a384540 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:26096
+  FORMAL BUILD NUMBER:26098
 */
 
-#define PRODUCT_VER_STRING "2.5.0.26096"
-#define FILE_VER_STRING "WI-V2.5.0.26096"
-#define LICENSE_VER_STRING "WI-V2.5.0.26096"
-#define FILE_VER_NUMBER 2, 5, 0, 26096
+#define PRODUCT_VER_STRING "2.5.0.26098"
+#define FILE_VER_STRING "WI-V2.5.0.26098"
+#define LICENSE_VER_STRING "WI-V2.5.0.26098"
+#define FILE_VER_NUMBER 2, 5, 0, 26098
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "5"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "26096"
+#define FB_BUILD_NO "26098"
 #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 234f990e75..4d908422c9 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=5
 RevNo=0
-BuildNum=26096
+BuildNum=26098
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds