[Firebird-checkins] SF.net SVN: firebird:[58333] firebird/trunk

[<fir...@us...>]

Revision: 58333
          http://sourceforge.net/p/firebird/code/58333
Author:   firebirds
Date:     2013-07-10 00:40:38 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
nightly update

Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-07-09 16:14:58 UTC (rev 58332)
+++ firebird/trunk/ChangeLog	2013-07-10 00:40:38 UTC (rev 58333)
@@ -1,3 +1,11 @@
+ 2013-07-09 16:14  dimitr 
+   M src/jrd/opt.cpp
+Restored (in the modified form) the code wrongly removed three years ago. This acts as a complimentary fix for CORE-4142.
+
+ 2013-07-09 15:18  dimitr 
+   M src/jrd/opt.cpp
+Fixed CORE-4142: Server crashes while preparing a query with DISTINCT and ORDER BY.
+
  2013-07-08 08:37  dimitr 
    M src/jrd/SysFunction.cpp
 CORE-3704: Add new context variables to the SYSTEM namespace.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-07-09 16:14:58 UTC (rev 58332)
+++ firebird/trunk/src/jrd/build_no.h	2013-07-10 00:40:38 UTC (rev 58333)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30512
+  FORMAL BUILD NUMBER:30514
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30512"
-#define FILE_VER_STRING "WI-T3.0.0.30512"
-#define LICENSE_VER_STRING "WI-T3.0.0.30512"
-#define FILE_VER_NUMBER 3, 0, 0, 30512
+#define PRODUCT_VER_STRING "3.0.0.30514"
+#define FILE_VER_STRING "WI-T3.0.0.30514"
+#define LICENSE_VER_STRING "WI-T3.0.0.30514"
+#define FILE_VER_NUMBER 3, 0, 0, 30514
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30512"
+#define FB_BUILD_NO "30514"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-07-09 16:14:58 UTC (rev 58332)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-07-10 00:40:38 UTC (rev 58333)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30512
+BuildNum=30514
 
 NowAt=`pwd`
 cd `dirname $0`

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.