From c132fa663c1a70893c0d857a42cedbdb4a4120f0 Mon Sep 17 00:00:00 2001
From: firebirds <firebirds@65644016-39b1-43b1-bf79-96bc8fe82c15>
Date: Fri, 4 May 2012 04:50:17 +0000
Subject: [PATCH] nightly update

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

diff --git a/ChangeLog b/ChangeLog
index 6b0445b244..3591c469b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+ 2012-05-03 16:43  asfernandes 
+   M src/dsql/AggNodes.cpp
+   M src/dsql/AggNodes.h
+   M src/dsql/BoolNodes.cpp
+   M src/dsql/BoolNodes.h
+   M src/dsql/DdlNodes.epp
+   M src/dsql/DdlNodes.h
+   M src/dsql/DsqlCompilerScratch.cpp
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/ExprNodes.h
+   M src/dsql/Nodes.h
+   M src/dsql/Parser.h
+   M src/dsql/StmtNodes.cpp
+   M src/dsql/StmtNodes.h
+   M src/dsql/WinNodes.cpp
+   M src/dsql/WinNodes.h
+   M src/dsql/dsql.h
+   M src/dsql/gen.cpp
+   M src/dsql/gen_proto.h
+   M src/dsql/make.cpp
+   M src/dsql/metd.epp
+   M src/dsql/metd_proto.h
+   M src/dsql/parse.y
+   M src/dsql/pass1.cpp
+   M src/dsql/pass1_proto.h
+   M src/jrd/RecordSourceNodes.cpp
+   M src/jrd/RecordSourceNodes.h
+   M src/jrd/extds/ExtDS.cpp
+   M src/jrd/par.cpp
+   M src/jrd/recsrc/ProcedureScan.cpp
+   M src/jrd/trace/TraceObjects.cpp
+Unify DSQL/JRD sub-nodes.
+
+ 2012-05-03 14:05  hvlad 
+   M src/jrd/cch.cpp
+   M src/jrd/nbak.cpp
+   M src/jrd/nbak.h
+Fixed bug CORE-3814 : SuperClassic server crashes when performing a database shutdown (FW=OFF)
+
  2012-04-29 18:39  asfernandes 
    M configure.in
 Make Ubuntu 12.04 build work.
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index f10cdca00a..fd3045300f 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:29946
+  FORMAL BUILD NUMBER:29948
 */
 
-#define PRODUCT_VER_STRING "3.0.0.29946"
-#define FILE_VER_STRING "WI-T3.0.0.29946"
-#define LICENSE_VER_STRING "WI-T3.0.0.29946"
-#define FILE_VER_NUMBER 3, 0, 0, 29946
+#define PRODUCT_VER_STRING "3.0.0.29948"
+#define FILE_VER_STRING "WI-T3.0.0.29948"
+#define LICENSE_VER_STRING "WI-T3.0.0.29948"
+#define FILE_VER_NUMBER 3, 0, 0, 29948
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "29946"
+#define FB_BUILD_NO "29948"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index 3ba8da3d73..8c22909c48 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=T
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=29946
+BuildNum=29948
 
 NowAt=`pwd`
 cd `dirname $0`