diff --git a/ChangeLog b/ChangeLog
index 88617ba964..5f0d7fdc2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,72 @@
+ 2011-02-12 21:32  dimitr 
+   M src/jrd/btn.h
+   M src/jrd/btr.cpp
+Fixed the error handling behavior in fast_load(), now it corresponds to the original (FB1) one.
+Fixed a possible bugcheck because of an unexpectedly missing index root page.
+Simplified the various jump node structures usage.
+
+ 2011-02-12 20:35  dimitr 
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/ExprNodes.h
+   M src/dsql/make.cpp
+   M src/jrd/par.cpp
+   M src/jrd/par_proto.h
+Cleaned up the unused FieldNode::defaultValue. Added a bit of constness to the class members.
+
+ 2011-02-12 20:32  dimitr 
+   M src/jrd/cmp.cpp
+Misc.
+
+ 2011-02-12 20:26  dimitr 
+   M src/jrd/evl.cpp
+Misc.
+
+ 2011-02-12 18:11  asfernandes 
+   M src/dsql/BoolNodes.cpp
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/Nodes.h
+   M src/jrd/Optimizer.cpp
+   M src/jrd/Optimizer.h
+Refactored out OPT_expression_equal while fixing checking of sameAs involving CASTs. Problem saw by Dmitry.
+
+ 2011-02-12 17:41  asfernandes 
+   M src/jrd/Optimizer.cpp
+   M src/jrd/Optimizer.h
+Avoid casts.
+
+ 2011-02-12 17:26  asfernandes 
+   M src/dsql/Nodes.h
+Misc
+
+ 2011-02-12 14:13  dimitr 
+   M src/dsql/BoolNodes.cpp
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/ExprNodes.h
+   M src/dsql/Nodes.h
+   M src/jrd/Optimizer.cpp
+   M src/jrd/RecordSourceNodes.cpp
+   M src/jrd/RecordSourceNodes.h
+   M src/jrd/opt.cpp
+Cleaned up the unused (since FB2) parameter.
+
+ 2011-02-12 14:01  dimitr 
+   M src/dsql/BoolNodes.cpp
+   M src/dsql/BoolNodes.h
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/ExprNodes.h
+   M src/dsql/Nodes.h
+   M src/jrd/Optimizer.cpp
+   M src/jrd/Optimizer.h
+   M src/jrd/RecordSourceNodes.h
+Refactored expression equality to make it independent from the stream being optimized.
+
+ 2011-02-12 08:59  dimitr 
+   M src/jrd/btr.h
+   M src/jrd/opt.cpp
+   M src/jrd/recsrc/RecordSource.h
+   M src/jrd/recsrc/SortedStream.cpp
+Misc.
+
  2011-02-12 02:00  asfernandes 
    M src/dsql/PackageNodes.epp
    M src/dsql/PackageNodes.h
diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h
index 45a5f75c6b..cee3030c3a 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:29087
+  FORMAL BUILD NUMBER:29097
 */
 
-#define PRODUCT_VER_STRING "3.0.0.29087"
-#define FILE_VER_STRING "WI-T3.0.0.29087"
-#define LICENSE_VER_STRING "WI-T3.0.0.29087"
-#define FILE_VER_NUMBER 3, 0, 0, 29087
+#define PRODUCT_VER_STRING "3.0.0.29097"
+#define FILE_VER_STRING "WI-T3.0.0.29097"
+#define LICENSE_VER_STRING "WI-T3.0.0.29097"
+#define FILE_VER_NUMBER 3, 0, 0, 29097
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "29087"
+#define FB_BUILD_NO "29097"
 #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 94474fbc07..433882d5ef 100755
--- a/src/misc/writeBuildNum.sh
+++ b/src/misc/writeBuildNum.sh
@@ -9,7 +9,7 @@ BuildType=T
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=29087
+BuildNum=29097
 
 NowAt=`pwd`
 cd `dirname $0`