Update.

doc/WhatsNew

@@ -2,6 +2,41 @@
   * v2.1.4
   ***************************
 
+    * Bugfix CORE-2822
+        Error "no current row for fetch operation" when subquery includes a non-trivial derived table
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
+    * Bugfix CORE-2820
+        Small memory leak in query with PLAN ORDER
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix CORE-2815
+        PIP page could be marked after it was really changed
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix CORE-2814
+        Bus error while sorting/merging on SPARC
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix CORE-2793
+        Binary representation of the backup file is inconsistent among subsequent backup/restore cycles
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
+    * Bugfix CORE-2785
+        BLOB transliteration problem in a specific case
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+
+    * Bugfix CORE-2783
+        Access violation using recursive query as subquery in select list and ordering by it
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
     * Bugfix CORE-2741
         Naive metadata extraction code in isql is defeated by "check" keyword typed in mixed case
       Contributor(s):
@@ -12,11 +47,21 @@
       Contributor(s):
         Vlad Khorsun <hvlad at users.sourceforge.net>
 
+    * Bugfix CORE-2698
+        Infinite wait in LocksCache::get 
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
     * Bugfix CORE-2684
         Error page NNN is of wrong type (expected 7, found N)
       Contributor(s):
         Vlad Khorsun <hvlad at users.sourceforge.net>
 
+    * Bugfix CORE-2675
+        Small memory leak per every blob transliteration
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
     * Bugfix CORE-2648
         NBackup's delta file ignores the "Forced Writes" database setting
       Contributor(s):
@@ -54,6 +99,11 @@
       Contributor(s):
         Dmitry Yemanov <dimitr at firebirdsql.org>
 
+    * Bugfix CORE-2578
+        select rdb$db_key from a view with more than one table joined results in a conversion error
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
     * Bugfix CORE-2572
         Locks of type LCK_page_space are processed incorrectly (big-endian machines)
       Contributor(s):
@@ -89,10 +139,10 @@
       Contributor(s):
         Adriano dos Santos Fernandes <adrianosf at uol.com.br>
 
-    * Improvement CORE-2597
-        Backport RPAD and LPAD return types from FB 2.5
+    * Improvement CORE-2769
+        Make XNET_CONNECT_TIMEOUT in xnet.h user configurable
       Contributor(s):
-        Adriano dos Santos Fernandes <adrianosf at uol.com.br>
+        Dmitry Yemanov <dimitr at firebirdsql.org>
 
     * Improvement CORE-1658
         Avoid memory consumption of <page size> bytes per every temporary blob

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:18262 
+  FORMAL BUILD NUMBER:18270 
 */
 
-#define PRODUCT_VER_STRING "2.1.4.18262"
-#define FILE_VER_STRING "WI-V2.1.4.18262"
-#define LICENSE_VER_STRING "WI-V2.1.4.18262"
-#define FILE_VER_NUMBER 2, 1, 4, 18262
+#define PRODUCT_VER_STRING "2.1.4.18270"
+#define FILE_VER_STRING "WI-V2.1.4.18270"
+#define LICENSE_VER_STRING "WI-V2.1.4.18270"
+#define FILE_VER_NUMBER 2, 1, 4, 18270
 #define FB_MAJOR_VER "2"
 #define FB_MINOR_VER "1"
 #define FB_REV_NO "4"
-#define FB_BUILD_NO "18262"
+#define FB_BUILD_NO "18270"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 2.1"

src/jrd/isc_version.h

@@ -17,7 +17,7 @@
  * Contributor(s): ______________________________________.
  */
 
-#define ISC_FILE_VER_STRING "WI-V6.3.4.18262"
-#define ISC_FILE_VER_NUMBER 6, 3, 4, 18262
+#define ISC_FILE_VER_STRING "WI-V6.3.4.18270"
+#define ISC_FILE_VER_NUMBER 6, 3, 4, 18270
 #define ISC_MAJOR_VER "6"
 #define ISC_MINOR_VER "3"

src/misc/writeBuildNum.sh

@@ -3,13 +3,13 @@
 # This file is used both to rebuild the header file and to set the 
 # environment variables on the config call
 
-BuildVersion="$Id: writeBuildNum.sh,v 1.17894.2.29 2009-12-28 14:48:52 dimitr Exp $"
+BuildVersion="$Id: writeBuildNum.sh,v 1.17894.2.30 2010-01-26 17:56:31 dimitr Exp $"
 
 BuildType=V
 MajorVer=2
 MinorVer=1
 RevNo=4
-BuildNum=18262
+BuildNum=18270
 
 if [ "$SPECIAL_BUILD_SUFFIX" = "" ]; then
 # Normal builds