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

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

Revision: 61973
          http://sourceforge.net/p/firebird/code/61973
Author:   firebirds
Date:     2015-07-13 00:09:06 +0000 (Mon, 13 Jul 2015)
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	2015-07-12 21:16:33 UTC (rev 61972)
+++ firebird/trunk/ChangeLog	2015-07-13 00:09:06 UTC (rev 61973)
@@ -1,3 +1,28 @@
+ 2015-07-12 21:16  asfernandes 
+   M lang_helpers/gds_codes.ftn
+   M lang_helpers/gds_codes.pas
+   M src/include/gen/codetext.h
+   M src/include/gen/iberror.h
+   M src/include/gen/msgs.h
+   M src/include/gen/sql_code.h
+   M src/include/gen/sql_state.h
+   M src/jrd/jrd.cpp
+   M src/msgs/facilities2.sql
+   M src/msgs/messages2.sql
+   M src/msgs/system_errors2.sql
+Fixed CORE-4279 - Invalid error message: "CHARACTER SET OCTETS is not defined" on db creation with isc_dpb_lc_ctype = OCTETS.
+
+ 2015-07-12 20:10  asfernandes 
+   M builds/install/misc/firebird.conf.in
+   M src/common/config/config.cpp
+   M src/jrd/trace/TraceManager.cpp
+Misc.
+
+ 2015-07-12 17:54  dimitr 
+   M src/jrd/RecordSourceNodes.cpp
+   M src/jrd/RecordSourceNodes.h
+Fixed CORE-4107: wrong resultset (subquery + derived table + union).
+
  2015-07-10 16:19  asfernandes 
    M src/jrd/IntlManager.cpp
    M src/jrd/IntlManager.h

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-07-12 21:16:33 UTC (rev 61972)
+++ firebird/trunk/src/jrd/build_no.h	2015-07-13 00:09:06 UTC (rev 61973)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31933
+  FORMAL BUILD NUMBER:31936
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31933"
-#define FILE_VER_STRING "WI-V3.0.0.31933"
-#define LICENSE_VER_STRING "WI-V3.0.0.31933"
-#define FILE_VER_NUMBER 3, 0, 0, 31933
+#define PRODUCT_VER_STRING "3.0.0.31936"
+#define FILE_VER_STRING "WI-V3.0.0.31936"
+#define LICENSE_VER_STRING "WI-V3.0.0.31936"
+#define FILE_VER_NUMBER 3, 0, 0, 31936
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31933"
+#define FB_BUILD_NO "31936"
 #define FB_BUILD_TYPE "V"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Release Candidate 1"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-07-12 21:16:33 UTC (rev 61972)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-07-13 00:09:06 UTC (rev 61973)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31933
+BuildNum=31936
 
 NowAt=`pwd`
 cd `dirname $0`

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