From 303982e0145fa26ab80a5da7b951ff48f56be34f Mon Sep 17 00:00:00 2001
From: firebirds <firebirds@65644016-39b1-43b1-bf79-96bc8fe82c15>
Date: Tue, 9 Nov 2010 03:22:17 +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 1c02d2d4f6..1a25f9c2ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+ 2010-11-08 16:17  alexpeshkoff 
+   M src/jrd/svc.cpp
+Backported fix for CORE-3220: isc_info_svc_get_users returns error message in the result cluster
+
+ 2010-11-08 10:31  dimitr 
+   M src/jrd/opt.cpp
+Fixed an old error which handles aggregates wrongly. So far it seems harmless for versions prior to v3.0 where it has been fixed, but let's be on the safe side.
+
+ 2010-11-08 09:14  dimitr 
+   M src/jrd/jrd.cpp
+Fixed CORE-3218: Statement cancellation request might be silently ignored by the currently running SQL code.
+
  2010-11-01 19:22  dimitr 
    M src/jrd/rse.cpp
 Misc.
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index d207016ff1..0bc6cc1d60 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:18363 
+  FORMAL BUILD NUMBER:18366 
 */
 
-#define PRODUCT_VER_STRING "2.1.4.18363"
-#define FILE_VER_STRING "WI-V2.1.4.18363"
-#define LICENSE_VER_STRING "WI-V2.1.4.18363"
-#define FILE_VER_NUMBER 2, 1, 4, 18363
+#define PRODUCT_VER_STRING "2.1.4.18366"
+#define FILE_VER_STRING "WI-V2.1.4.18366"
+#define LICENSE_VER_STRING "WI-V2.1.4.18366"
+#define FILE_VER_NUMBER 2, 1, 4, 18366
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "1"
 #define FB_REV_NO "4"
-#define FB_BUILD_NO "18363"
+#define FB_BUILD_NO "18366"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.1"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index b2e0fdf7ad..76c44d1ff1 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=1
 RevNo=4
-BuildNum=18363
+BuildNum=18366
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds