From 8d085f35a3088a5f67b898771431b7c7a586a6a8 Mon Sep 17 00:00:00 2001
From: firebirds <firebirds@65644016-39b1-43b1-bf79-96bc8fe82c15>
Date: Thu, 2 Jun 2011 03:31:08 +0000
Subject: [PATCH] nightly update

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

diff --git a/ChangeLog b/ChangeLog
index e03e06a7b7..33d307b991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+ 2011-06-01 08:55  alexpeshkoff 
+   M src/burp/restore.epp
+Backported CORE-3461: DDL operations fail after backup/restore
+
+ 2011-06-01 08:07  alexpeshkoff 
+   M src/include/types_pub.h
+   M src/remote/inet.cpp
+HPUX/PARISC port - awful hack to avoid errors in OS
+
  2011-05-25 10:56  dimitr 
    M src/jrd/evl.cpp
 Fixed CORE-3493: Adding a value to a timestamp below '16.11.1858 00:00:01' throws 'value exceeds the range for valid timestamp'. v2.1 wasn't really affected although the validation sequence was wrong.
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 74b5dd04cf..ee91e7e94a 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:18423 
+  FORMAL BUILD NUMBER:18425 
 */
 
-#define PRODUCT_VER_STRING "2.1.5.18423"
-#define FILE_VER_STRING "WI-V2.1.5.18423"
-#define LICENSE_VER_STRING "WI-V2.1.5.18423"
-#define FILE_VER_NUMBER 2, 1, 5, 18423
+#define PRODUCT_VER_STRING "2.1.5.18425"
+#define FILE_VER_STRING "WI-V2.1.5.18425"
+#define LICENSE_VER_STRING "WI-V2.1.5.18425"
+#define FILE_VER_NUMBER 2, 1, 5, 18425
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "1"
 #define FB_REV_NO "5"
-#define FB_BUILD_NO "18423"
+#define FB_BUILD_NO "18425"
 #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 e41b272d42..e569f001c3 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=V
 MajorVer=2
 MinorVer=1
 RevNo=5
-BuildNum=18423
+BuildNum=18425
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds