From ee77cc20e1420e70251d715761e54aeb4583f8ed Mon Sep 17 00:00:00 2001
From: firebirds <firebirds@65644016-39b1-43b1-bf79-96bc8fe82c15>
Date: Mon, 17 Oct 2011 03:18:32 +0000
Subject: [PATCH] nightly update

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

diff --git a/ChangeLog b/ChangeLog
index c529d20d27..b2dcb8bb87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+ 2011-10-16 20:36  asfernandes 
+   M src/dsql/BlrWriter.cpp
+   M src/dsql/BlrWriter.h
+   M src/dsql/DdlNodes.epp
+   M src/dsql/DsqlCompilerScratch.cpp
+   M src/dsql/DsqlCompilerScratch.h
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/Nodes.h
+   M src/dsql/StmtNodes.cpp
+   M src/dsql/StmtNodes.h
+   M src/dsql/dsql.h
+   M src/dsql/parse.y
+   M src/dsql/pass1.cpp
+   M src/include/consts_pub.h
+   M src/jrd/DebugInterface.cpp
+   M src/jrd/DebugInterface.h
+   M src/jrd/ExtEngineManager.cpp
+   M src/jrd/Function.epp
+   M src/jrd/Function.h
+   M src/jrd/JrdStatement.cpp
+   M src/jrd/RecordSourceNodes.cpp
+   M src/jrd/Routine.h
+   M src/jrd/blp.h
+   M src/jrd/blr.h
+   M src/jrd/dfw.epp
+   M src/jrd/evl.cpp
+   M src/jrd/exe.cpp
+   M src/jrd/exe.h
+   M src/jrd/fun.epp
+   M src/jrd/jrd.h
+   M src/jrd/met.epp
+   M src/jrd/met_proto.h
+   M src/jrd/par.cpp
+   M src/yvalve/gds.cpp
+Feature CORE-3626 - Subfunctions in PSQL and EXECUTE BLOCK.
+Tests at http://firebird.cvs.sourceforge.net/viewvc/firebird/fbtcs/GTCS/tests/FB_SQL_SUBFUNC_1.output.
+Also did:
+- Refactor to share more code/data between procedures and functions.
+- Fixed some PSQL functions problems.
+
+ 2011-10-16 14:10  hvlad 
+   M src/jrd/trace/TraceConfigStorage.cpp
+   M src/jrd/trace/TraceConfigStorage.h
+Port forward fix for bug CORE-3636 : Firebird 2.5.1 server crashes with Trace API
+
  2011-10-13 12:39  alexpeshkoff 
    M src/jrd/trace/TraceConfigStorage.cpp
    M src/jrd/trace/TraceConfigStorage.h
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 883df7ff6a..78ed62495f 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:29588
+  FORMAL BUILD NUMBER:29590
 */
 
-#define PRODUCT_VER_STRING "3.0.0.29588"
-#define FILE_VER_STRING "WI-T3.0.0.29588"
-#define LICENSE_VER_STRING "WI-T3.0.0.29588"
-#define FILE_VER_NUMBER 3, 0, 0, 29588
+#define PRODUCT_VER_STRING "3.0.0.29590"
+#define FILE_VER_STRING "WI-T3.0.0.29590"
+#define LICENSE_VER_STRING "WI-T3.0.0.29590"
+#define FILE_VER_NUMBER 3, 0, 0, 29590
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "29588"
+#define FB_BUILD_NO "29590"
 #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 c15390f244..33b1610a22 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=T
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=29588
+BuildNum=29590
 
 NowAt=`pwd`
 cd `dirname $0`