From 7147cae5f70a470b4c165a5e92a2cc6c1fcc20a8 Mon Sep 17 00:00:00 2001
From: firebirds <firebirds@65644016-39b1-43b1-bf79-96bc8fe82c15>
Date: Fri, 30 Aug 2013 00:30:04 +0000
Subject: [PATCH] nightly update

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

diff --git a/ChangeLog b/ChangeLog
index e9cb25ed25..4751bc1c0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+ 2013-08-29 16:05  asfernandes 
+   M src/dsql/DdlNodes.epp
+   M src/dsql/DdlNodes.h
+   M src/dsql/Nodes.h
+   M src/dsql/Parser.cpp
+   M src/dsql/make.cpp
+   M src/dsql/make_proto.h
+   M src/dsql/parse.y
+Simplificate representation of 64-bit numbers and sequences in the parser.
+
+ 2013-08-29 15:51  asfernandes 
+   M src/dsql/Parser.cpp
+Fixed CORE-4198 - Incorrect "token unknown" error when the SQL string ends with a hex number literal.
+
  2013-08-27 17:04  fsg 
    M builds/posix/Makefile.in.extern.editline
    M extern/editline/src/eln.c
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 71aec52760..d1fba1f703 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:30624
+  FORMAL BUILD NUMBER:30626
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30624"
-#define FILE_VER_STRING "WI-T3.0.0.30624"
-#define LICENSE_VER_STRING "WI-T3.0.0.30624"
-#define FILE_VER_NUMBER 3, 0, 0, 30624
+#define PRODUCT_VER_STRING "3.0.0.30626"
+#define FILE_VER_STRING "WI-T3.0.0.30626"
+#define LICENSE_VER_STRING "WI-T3.0.0.30626"
+#define FILE_VER_NUMBER 3, 0, 0, 30626
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30624"
+#define FB_BUILD_NO "30626"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh
index 76a9cdede0..d5e4f58e0b 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=T
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30624
+BuildNum=30626
 
 NowAt=`pwd`
 cd `dirname $0`