| 
      
      
      From: <asf...@us...> - 2014-03-04 02:12:19
       | 
| Revision: 59224
          http://sourceforge.net/p/firebird/code/59224
Author:   asfernandes
Date:     2014-03-04 02:12:15 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
Misc.
Modified Paths:
--------------
    firebird/trunk/builds/install/arch-specific/linux/README
    firebird/trunk/src/burp/restore.epp
    firebird/trunk/src/common/os/win32/mod_loader.cpp
    firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
    firebird/trunk/src/jrd/trace/TraceObjects.h
Modified: firebird/trunk/builds/install/arch-specific/linux/README
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/README	2014-03-04 01:55:26 UTC (rev 59223)
+++ firebird/trunk/builds/install/arch-specific/linux/README	2014-03-04 02:12:15 UTC (rev 59224)
@@ -10,7 +10,11 @@
 
 http://www.ibphoenix.com
 
-Firebird is a relational database offering many ANSI SQL standard features that runs on Linux, Windows, and a variety of Unix platforms. Firebird offers excellent concurrency, high performance, and powerful language support for stored procedures and triggers. It has been used in production systems, under a variety of names, since 1981.
+Firebird is a relational database offering many ANSI SQL standard features that
+runs on Linux, Windows, and a variety of Unix platforms. Firebird offers
+excellent concurrency, high performance, and powerful language support for
+stored procedures and triggers. It has been used in production systems, under a
+variety of names, since 1981.
 
 http://www.firebirdsql.org/en/about-firebird/
 
Modified: firebird/trunk/src/burp/restore.epp
===================================================================
--- firebird/trunk/src/burp/restore.epp	2014-03-04 01:55:26 UTC (rev 59223)
+++ firebird/trunk/src/burp/restore.epp	2014-03-04 02:12:15 UTC (rev 59224)
@@ -9097,8 +9097,6 @@
 			X.RDB$OBJECT_TYPE.NULL = FALSE;
 			X.RDB$OBJECT_TYPE = object_type;
 
-
-
 			// If OBJECT_TYPE didn't exist before and we have a field level
 			// user privileges, then use obj_field instead.
 
@@ -9495,8 +9493,8 @@
  *	than the new.
  *
  **************************************/
-	UCHAR* p = 0;
-	const UCHAR* q = 0;
+	UCHAR* p = NULL;
+	const UCHAR* q = NULL;
 
 	for (const burp_fld* field = relation->rel_fields; field; field = field->fld_next)
 	{
Modified: firebird/trunk/src/common/os/win32/mod_loader.cpp
===================================================================
--- firebird/trunk/src/common/os/win32/mod_loader.cpp	2014-03-04 01:55:26 UTC (rev 59223)
+++ firebird/trunk/src/common/os/win32/mod_loader.cpp	2014-03-04 02:12:15 UTC (rev 59224)
@@ -168,7 +168,7 @@
 {
 	ContextActivator ctx;
 
-	const HMODULE hMod = 
+	const HMODULE hMod =
 		LoadLibraryEx(module.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_AS_DATAFILE);
 
 	if (hMod) {
@@ -206,9 +206,7 @@
 	}
 
 	if (!module)
-	{
 		module = LoadLibraryEx(modPath.c_str(), 0, LOAD_WITH_ALTERED_SEARCH_PATH);
-	}
 
 	// Restore old mode in case we are embedded into user application
 	SetErrorMode(oldErrorMode);
Modified: firebird/trunk/src/jrd/trace/TraceJrdHelpers.h
===================================================================
--- firebird/trunk/src/jrd/trace/TraceJrdHelpers.h	2014-03-04 01:55:26 UTC (rev 59223)
+++ firebird/trunk/src/jrd/trace/TraceJrdHelpers.h	2014-03-04 02:12:15 UTC (rev 59224)
@@ -223,7 +223,7 @@
 class TraceFuncExecute
 {
 public:
-	TraceFuncExecute(thread_db* tdbb, jrd_req* request, jrd_req* caller, 
+	TraceFuncExecute(thread_db* tdbb, jrd_req* request, jrd_req* caller,
 					 const UCHAR* inMsg, ULONG inMsgLength) :
 		m_tdbb(tdbb),
 		m_request(request),
@@ -241,8 +241,8 @@
 		{	// scope
 			TraceConnectionImpl conn(m_tdbb->getAttachment());
 			TraceTransactionImpl tran(m_tdbb->getTransaction());
-			
-			TraceParamsFromMsgImpl inputs(*getDefaultMemoryPool(), 
+
+			TraceParamsFromMsgImpl inputs(*getDefaultMemoryPool(),
 				m_request->getStatement()->function->getInputFormat(),
 				m_inMsg, m_inMsgLength);
 			TraceFunctionImpl func(m_request, &inputs, NULL, NULL);
@@ -280,7 +280,7 @@
 		TraceConnectionImpl conn(m_tdbb->getAttachment());
 		TraceTransactionImpl tran(m_tdbb->getTransaction());
 
-		TraceParamsFromMsgImpl inputs(*getDefaultMemoryPool(), 
+		TraceParamsFromMsgImpl inputs(*getDefaultMemoryPool(),
 			m_request->getStatement()->function->getInputFormat(),
 			m_inMsg, m_inMsgLength);
 
@@ -298,7 +298,7 @@
 	bool m_need_trace;
 	thread_db* const m_tdbb;
 	jrd_req* const m_request;
-	const UCHAR* m_inMsg; 
+	const UCHAR* m_inMsg;
 	ULONG m_inMsgLength;
 	SINT64 m_start_clock;
 };
Modified: firebird/trunk/src/jrd/trace/TraceObjects.h
===================================================================
--- firebird/trunk/src/jrd/trace/TraceObjects.h	2014-03-04 01:55:26 UTC (rev 59223)
+++ firebird/trunk/src/jrd/trace/TraceObjects.h	2014-03-04 02:12:15 UTC (rev 59224)
@@ -280,7 +280,7 @@
 class TraceParamsFromMsgImpl : public TraceParamsImpl
 {
 public:
-	TraceParamsFromMsgImpl(Firebird::MemoryPool& pool, const Format* format, 
+	TraceParamsFromMsgImpl(Firebird::MemoryPool& pool, const Format* format,
 		const UCHAR* inMsg, ULONG inMsgLength) :
 		TraceParamsImpl(pool),
 		m_format(format),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-05 01:15:35
       | 
| Revision: 59228
          http://sourceforge.net/p/firebird/code/59228
Author:   firebirds
Date:     2014-03-05 01:15:32 +0000 (Wed, 05 Mar 2014)
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	2014-03-04 14:25:49 UTC (rev 59227)
+++ firebird/trunk/ChangeLog	2014-03-05 01:15:32 UTC (rev 59228)
@@ -1,3 +1,32 @@
+ 2014-03-04 14:25  robocop 
+   M src/utilities/gstat/ppg.cpp
+Misc.
+
+ 2014-03-04 14:24  robocop 
+   M src/burp/backup.epp
+   M src/burp/burp.h
+   M src/burp/restore.epp
+   M src/msgs/facilities2.sql
+   M src/msgs/messages2.sql
+Backup and restore rdb$linger.
+
+ 2014-03-04 14:21  robocop 
+   M src/burp/burp.h
+   M src/burp/restore.epp
+Cleanup: remove useless burp_fld.fld_character_length.
+
+ 2014-03-04 02:12  asfernandes 
+   M builds/install/arch-specific/linux/README
+   M src/burp/restore.epp
+   M src/common/os/win32/mod_loader.cpp
+   M src/jrd/trace/TraceJrdHelpers.h
+   M src/jrd/trace/TraceObjects.h
+Misc.
+
+ 2014-03-04 01:55  asfernandes 
+   M builds/install/misc/firebird.conf.in
+Adjust for the change in the code.
+
  2014-03-03 20:00  robocop 
    M src/burp/backup.epp
    M src/burp/restore.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-04 14:25:49 UTC (rev 59227)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-05 01:15:32 UTC (rev 59228)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30937
+  FORMAL BUILD NUMBER:30942
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30937"
-#define FILE_VER_STRING "WI-T3.0.0.30937"
-#define LICENSE_VER_STRING "WI-T3.0.0.30937"
-#define FILE_VER_NUMBER 3, 0, 0, 30937
+#define PRODUCT_VER_STRING "3.0.0.30942"
+#define FILE_VER_STRING "WI-T3.0.0.30942"
+#define LICENSE_VER_STRING "WI-T3.0.0.30942"
+#define FILE_VER_NUMBER 3, 0, 0, 30942
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30937"
+#define FB_BUILD_NO "30942"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-04 14:25:49 UTC (rev 59227)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-05 01:15:32 UTC (rev 59228)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30937
+BuildNum=30942
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-06 00:32:22
       | 
| Revision: 59231
          http://sourceforge.net/p/firebird/code/59231
Author:   firebirds
Date:     2014-03-06 00:32:18 +0000 (Thu, 06 Mar 2014)
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	2014-03-05 16:59:59 UTC (rev 59230)
+++ firebird/trunk/ChangeLog	2014-03-06 00:32:18 UTC (rev 59231)
@@ -1,3 +1,13 @@
+ 2014-03-05 16:59  mapopa 
+   M builds/install/arch-specific/linux/linuxLibrary.sh.in
+make init script writeable by the root user 
+
+ 2014-03-05 02:15  asfernandes 
+   M src/jrd/blb.cpp
+   M src/jrd/sdw.cpp
+   M src/utilities/rebuild/rebuild.cpp
+Misc.
+
  2014-03-04 14:25  robocop 
    M src/utilities/gstat/ppg.cpp
 Misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-05 16:59:59 UTC (rev 59230)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-06 00:32:18 UTC (rev 59231)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30942
+  FORMAL BUILD NUMBER:30944
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30942"
-#define FILE_VER_STRING "WI-T3.0.0.30942"
-#define LICENSE_VER_STRING "WI-T3.0.0.30942"
-#define FILE_VER_NUMBER 3, 0, 0, 30942
+#define PRODUCT_VER_STRING "3.0.0.30944"
+#define FILE_VER_STRING "WI-T3.0.0.30944"
+#define LICENSE_VER_STRING "WI-T3.0.0.30944"
+#define FILE_VER_NUMBER 3, 0, 0, 30944
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30942"
+#define FB_BUILD_NO "30944"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-05 16:59:59 UTC (rev 59230)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-06 00:32:18 UTC (rev 59231)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30942
+BuildNum=30944
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-07 00:48:47
       | 
| Revision: 59234
          http://sourceforge.net/p/firebird/code/59234
Author:   firebirds
Date:     2014-03-07 00:48:44 +0000 (Fri, 07 Mar 2014)
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	2014-03-06 16:20:24 UTC (rev 59233)
+++ firebird/trunk/ChangeLog	2014-03-07 00:48:44 UTC (rev 59234)
@@ -1,3 +1,11 @@
+ 2014-03-06 16:20  asfernandes 
+   M src/jrd/RecordSourceNodes.cpp
+Fixed CORE-4357 - Parsing of recursive query returns error "Column does not belong to referenced table" for source that HAS such column. Relates to CORE-4322.
+
+ 2014-03-06 16:20  asfernandes 
+   M src/burp/restore.epp
+Warnings.
+
  2014-03-05 16:59  mapopa 
    M builds/install/arch-specific/linux/linuxLibrary.sh.in
 make init script writeable by the root user 
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-06 16:20:24 UTC (rev 59233)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-07 00:48:44 UTC (rev 59234)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30944
+  FORMAL BUILD NUMBER:30946
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30944"
-#define FILE_VER_STRING "WI-T3.0.0.30944"
-#define LICENSE_VER_STRING "WI-T3.0.0.30944"
-#define FILE_VER_NUMBER 3, 0, 0, 30944
+#define PRODUCT_VER_STRING "3.0.0.30946"
+#define FILE_VER_STRING "WI-T3.0.0.30946"
+#define LICENSE_VER_STRING "WI-T3.0.0.30946"
+#define FILE_VER_NUMBER 3, 0, 0, 30946
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30944"
+#define FB_BUILD_NO "30946"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-06 16:20:24 UTC (rev 59233)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-07 00:48:44 UTC (rev 59234)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30944
+BuildNum=30946
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-08 00:34:32
       | 
| Revision: 59238
          http://sourceforge.net/p/firebird/code/59238
Author:   firebirds
Date:     2014-03-08 00:34:29 +0000 (Sat, 08 Mar 2014)
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	2014-03-07 20:34:00 UTC (rev 59237)
+++ firebird/trunk/ChangeLog	2014-03-08 00:34:29 UTC (rev 59238)
@@ -1,3 +1,18 @@
+ 2014-03-07 20:34  robocop 
+   M src/isql/extract.epp
+   M src/isql/isql.epp
+Misc.
+
+ 2014-03-07 16:21  asfernandes 
+   M src/jrd/recsrc/HashJoin.cpp
+Fixed problem with hash join using keys with non-none character set. Dmitry, please review.
+
+ 2014-03-07 12:48  hvlad 
+   M src/jrd/trace/TraceJrdHelpers.h
+   M src/jrd/trace/TraceObjects.cpp
+   M src/jrd/trace/TraceObjects.h
+Refactor TraceParamsImpl and company
+
  2014-03-06 16:20  asfernandes 
    M src/jrd/RecordSourceNodes.cpp
 Fixed CORE-4357 - Parsing of recursive query returns error "Column does not belong to referenced table" for source that HAS such column. Relates to CORE-4322.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-07 20:34:00 UTC (rev 59237)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-08 00:34:29 UTC (rev 59238)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30946
+  FORMAL BUILD NUMBER:30949
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30946"
-#define FILE_VER_STRING "WI-T3.0.0.30946"
-#define LICENSE_VER_STRING "WI-T3.0.0.30946"
-#define FILE_VER_NUMBER 3, 0, 0, 30946
+#define PRODUCT_VER_STRING "3.0.0.30949"
+#define FILE_VER_STRING "WI-T3.0.0.30949"
+#define LICENSE_VER_STRING "WI-T3.0.0.30949"
+#define FILE_VER_NUMBER 3, 0, 0, 30949
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30946"
+#define FB_BUILD_NO "30949"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-07 20:34:00 UTC (rev 59237)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-08 00:34:29 UTC (rev 59238)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30946
+BuildNum=30949
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-09 00:31:06
       | 
| Revision: 59240
          http://sourceforge.net/p/firebird/code/59240
Author:   firebirds
Date:     2014-03-09 00:31:01 +0000 (Sun, 09 Mar 2014)
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	2014-03-08 07:26:08 UTC (rev 59239)
+++ firebird/trunk/ChangeLog	2014-03-09 00:31:01 UTC (rev 59240)
@@ -1,3 +1,7 @@
+ 2014-03-08 07:26  dimitr 
+   M src/jrd/Optimizer.cpp
+Totally misc.
+
  2014-03-07 20:34  robocop 
    M src/isql/extract.epp
    M src/isql/isql.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-08 07:26:08 UTC (rev 59239)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-09 00:31:01 UTC (rev 59240)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30949
+  FORMAL BUILD NUMBER:30950
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30949"
-#define FILE_VER_STRING "WI-T3.0.0.30949"
-#define LICENSE_VER_STRING "WI-T3.0.0.30949"
-#define FILE_VER_NUMBER 3, 0, 0, 30949
+#define PRODUCT_VER_STRING "3.0.0.30950"
+#define FILE_VER_STRING "WI-T3.0.0.30950"
+#define LICENSE_VER_STRING "WI-T3.0.0.30950"
+#define FILE_VER_NUMBER 3, 0, 0, 30950
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30949"
+#define FB_BUILD_NO "30950"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-08 07:26:08 UTC (rev 59239)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-09 00:31:01 UTC (rev 59240)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30949
+BuildNum=30950
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-10 00:32:56
       | 
| Revision: 59244
          http://sourceforge.net/p/firebird/code/59244
Author:   firebirds
Date:     2014-03-10 00:32:53 +0000 (Mon, 10 Mar 2014)
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	2014-03-09 09:33:35 UTC (rev 59243)
+++ firebird/trunk/ChangeLog	2014-03-10 00:32:53 UTC (rev 59244)
@@ -1,3 +1,17 @@
+ 2014-03-09 09:33  dimitr 
+   M src/dsql/ExprNodes.cpp
+Reworked one of my prior commits that caused regression CORE-4360: Select from derived table which contains GROUP BY on field with literal value returns wrong result.
+
+ 2014-03-09 09:30  dimitr 
+   M src/dsql/pass1.cpp
+Fixed what I believe was a mistake.
+
+ 2014-03-09 01:55  asfernandes 
+   M src/common/classes/InternalMessageBuffer.cpp
+   M src/common/classes/InternalMessageBuffer.h
+   M src/jrd/extds/InternalDS.cpp
+Cleanup InternalMessageBuffer.
+
  2014-03-08 07:26  dimitr 
    M src/jrd/Optimizer.cpp
 Totally misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-09 09:33:35 UTC (rev 59243)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-10 00:32:53 UTC (rev 59244)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30950
+  FORMAL BUILD NUMBER:30953
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30950"
-#define FILE_VER_STRING "WI-T3.0.0.30950"
-#define LICENSE_VER_STRING "WI-T3.0.0.30950"
-#define FILE_VER_NUMBER 3, 0, 0, 30950
+#define PRODUCT_VER_STRING "3.0.0.30953"
+#define FILE_VER_STRING "WI-T3.0.0.30953"
+#define LICENSE_VER_STRING "WI-T3.0.0.30953"
+#define FILE_VER_NUMBER 3, 0, 0, 30953
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30950"
+#define FB_BUILD_NO "30953"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-09 09:33:35 UTC (rev 59243)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-10 00:32:53 UTC (rev 59244)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30950
+BuildNum=30953
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-13 00:35:49
       | 
| Revision: 59259
          http://sourceforge.net/p/firebird/code/59259
Author:   firebirds
Date:     2014-03-13 00:35:45 +0000 (Thu, 13 Mar 2014)
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	2014-03-12 17:13:05 UTC (rev 59258)
+++ firebird/trunk/ChangeLog	2014-03-13 00:35:45 UTC (rev 59259)
@@ -1,3 +1,68 @@
+ 2014-03-12 17:13  roman-simakov 
+   M src/jrd/jrd.h
+   M src/jrd/validation.cpp
+Misc
+
+ 2014-03-12 15:51  roman-simakov 
+   M src/jrd/jrd.h
+   M src/jrd/validation.cpp
+Corrected gfix messages to avoid user's panic. Reviewed by Vlad.
+
+ 2014-03-12 09:32  alexpeshkoff 
+   M src/common/MsgMetadata.cpp
+   M src/common/MsgMetadata.h
+   M src/include/firebird/Provider.h
+   M src/yvalve/why.cpp
+Make functions in IMessageMetadata non-const like the rest of interfaces
+
+ 2014-03-12 09:19  alexpeshkoff 
+   M src/yvalve/why.cpp
+Patch from Dimitry Sibiryakov - enable access to messages longer than 64Kb from SQLDA. Slightly modified to avoid code duplication.
+
+ 2014-03-11 07:53  robocop 
+   M src/isql/extract.epp
+   M src/isql/show.epp
+Include rdb$linger in SHOW DATABASE and-x (extract database).
+
+ 2014-03-11 07:47  robocop 
+   M src/isql/isql.epp
+The new API requires checking for null pointer before, not after the call. Maybe there are other places that need adjustment.
+
+ 2014-03-11 07:40  robocop 
+   M src/jrd/vio.cpp
+More restrictions on sys tables. Please report if you have problems with DDL or the utilities.
+
+ 2014-03-11 06:22  robocop 
+   M src/isql/extract.epp
+   M src/isql/isql.epp
+   M src/isql/show.epp
+Gpre was generating code to connect isql to the build db (yachts) instead of the runtime db.
+
+ 2014-03-11 06:19  robocop 
+   M src/gpre/obj_cxx.cpp
+- I was caught by a null pointer due to an error reported by the engine in embedded mode. I prefer the code generated by gpre to be redundant for now.
+- When starting multiple txns, the code was printing the next, not the current in the loop.
+
+ 2014-03-11 06:12  robocop 
+   M src/gpre/boot/gpre_meta_boot.cpp
+Misc.
+
+ 2014-03-11 06:11  robocop 
+   M src/jrd/ini.epp
+Add the missing ACL_end because walk_acl() doesn't detect the end of the stream and reads trash instead, producing the strange message (unrecognized ACL) instead of the denied access right.
+
+ 2014-03-11 06:09  robocop 
+   M src/jrd/pag.cpp
+Use memset.
+
+ 2014-03-11 06:08  robocop 
+   M src/isql/isql.epp
+isql embedded hangs when trying to quit after an error (thanks Vlad for solution).
+
+ 2014-03-11 06:07  robocop 
+   M src/jrd/btr.cpp
+Misc.
+
  2014-03-09 09:33  dimitr 
    M src/dsql/ExprNodes.cpp
 Reworked one of my prior commits that caused regression CORE-4360: Select from derived table which contains GROUP BY on field with literal value returns wrong result.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-12 17:13:05 UTC (rev 59258)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-13 00:35:45 UTC (rev 59259)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30953
+  FORMAL BUILD NUMBER:30967
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30953"
-#define FILE_VER_STRING "WI-T3.0.0.30953"
-#define LICENSE_VER_STRING "WI-T3.0.0.30953"
-#define FILE_VER_NUMBER 3, 0, 0, 30953
+#define PRODUCT_VER_STRING "3.0.0.30967"
+#define FILE_VER_STRING "WI-T3.0.0.30967"
+#define LICENSE_VER_STRING "WI-T3.0.0.30967"
+#define FILE_VER_NUMBER 3, 0, 0, 30967
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30953"
+#define FB_BUILD_NO "30967"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-12 17:13:05 UTC (rev 59258)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-13 00:35:45 UTC (rev 59259)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30953
+BuildNum=30967
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-15 03:08:50
       | 
| Revision: 59265
          http://sourceforge.net/p/firebird/code/59265
Author:   firebirds
Date:     2014-03-15 03:08:46 +0000 (Sat, 15 Mar 2014)
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	2014-03-14 16:45:09 UTC (rev 59264)
+++ firebird/trunk/ChangeLog	2014-03-15 03:08:46 UTC (rev 59265)
@@ -1,3 +1,18 @@
+ 2014-03-14 16:45  asfernandes 
+   M src/jrd/vio.cpp
+Fixed restore of sh_test.gbk in TCS.
+
+ 2014-03-14 15:41  asfernandes 
+   M src/isql/isql.epp
+Fixed problem with SHOW GENERATOR after SET GENERATOR became DDL.
+
+ 2014-03-14 00:42  robocop 
+   M src/common/classes/InternalMessageBuffer.cpp
+   M src/jrd/ExtEngineManager.cpp
+   M src/jrd/met.epp
+   M src/yvalve/why.cpp
+Misc.
+
  2014-03-12 17:13  roman-simakov 
    M src/jrd/jrd.h
    M src/jrd/validation.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-14 16:45:09 UTC (rev 59264)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-15 03:08:46 UTC (rev 59265)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30967
+  FORMAL BUILD NUMBER:30970
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30967"
-#define FILE_VER_STRING "WI-T3.0.0.30967"
-#define LICENSE_VER_STRING "WI-T3.0.0.30967"
-#define FILE_VER_NUMBER 3, 0, 0, 30967
+#define PRODUCT_VER_STRING "3.0.0.30970"
+#define FILE_VER_STRING "WI-T3.0.0.30970"
+#define LICENSE_VER_STRING "WI-T3.0.0.30970"
+#define FILE_VER_NUMBER 3, 0, 0, 30970
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30967"
+#define FB_BUILD_NO "30970"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-14 16:45:09 UTC (rev 59264)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-15 03:08:46 UTC (rev 59265)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30967
+BuildNum=30970
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-16 00:45:03
       | 
| Revision: 59269
          http://sourceforge.net/p/firebird/code/59269
Author:   firebirds
Date:     2014-03-16 00:44:59 +0000 (Sun, 16 Mar 2014)
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	2014-03-15 18:43:45 UTC (rev 59268)
+++ firebird/trunk/ChangeLog	2014-03-16 00:44:59 UTC (rev 59269)
@@ -1,3 +1,14 @@
+ 2014-03-15 18:43  dimitr 
+   M src/dsql/ExprNodes.cpp
+Fixed CORE-4366: Wrong result of WHERE predicate when it contains NULL IS NOT DISTINCT FROM (select min(NULL) from ...)
+
+ 2014-03-15 18:00  dimitr 
+   M src/jrd/RecordSourceNodes.cpp
+   M src/jrd/opt.cpp
+   M src/jrd/opt_proto.h
+   M src/jrd/rse.h
+Refactored the conjuncts handling code in the optimizer to be simpler and avoid duplication. As a side effect, this also fixes CORE-4365: Equality predicate distribution does not work for some complex queries. Cleanup up some legacy checks that I consider unnecessary. 
+
  2014-03-14 16:45  asfernandes 
    M src/jrd/vio.cpp
 Fixed restore of sh_test.gbk in TCS.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-15 18:43:45 UTC (rev 59268)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-16 00:44:59 UTC (rev 59269)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30970
+  FORMAL BUILD NUMBER:30972
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30970"
-#define FILE_VER_STRING "WI-T3.0.0.30970"
-#define LICENSE_VER_STRING "WI-T3.0.0.30970"
-#define FILE_VER_NUMBER 3, 0, 0, 30970
+#define PRODUCT_VER_STRING "3.0.0.30972"
+#define FILE_VER_STRING "WI-T3.0.0.30972"
+#define LICENSE_VER_STRING "WI-T3.0.0.30972"
+#define FILE_VER_NUMBER 3, 0, 0, 30972
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30970"
+#define FB_BUILD_NO "30972"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-15 18:43:45 UTC (rev 59268)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-16 00:44:59 UTC (rev 59269)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30970
+BuildNum=30972
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-17 02:39:34
       | 
| Revision: 59274
          http://sourceforge.net/p/firebird/code/59274
Author:   firebirds
Date:     2014-03-17 02:39:29 +0000 (Mon, 17 Mar 2014)
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	2014-03-16 18:46:57 UTC (rev 59273)
+++ firebird/trunk/ChangeLog	2014-03-17 02:39:29 UTC (rev 59274)
@@ -1,3 +1,17 @@
+ 2014-03-16 18:46  asfernandes 
+   M src/jrd/Optimizer.h
+   M src/jrd/opt.cpp
+Scope.
+
+ 2014-03-16 18:41  asfernandes 
+   M src/burp/restore.epp
+   M src/isql/extract.epp
+   M src/isql/show.epp
+   M src/jrd/RecordSourceNodes.cpp
+   M src/jrd/pag.cpp
+   M src/jrd/trace/TraceObjects.h
+Misc.
+
  2014-03-15 18:43  dimitr 
    M src/dsql/ExprNodes.cpp
 Fixed CORE-4366: Wrong result of WHERE predicate when it contains NULL IS NOT DISTINCT FROM (select min(NULL) from ...)
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-16 18:46:57 UTC (rev 59273)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-17 02:39:29 UTC (rev 59274)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30972
+  FORMAL BUILD NUMBER:30974
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30972"
-#define FILE_VER_STRING "WI-T3.0.0.30972"
-#define LICENSE_VER_STRING "WI-T3.0.0.30972"
-#define FILE_VER_NUMBER 3, 0, 0, 30972
+#define PRODUCT_VER_STRING "3.0.0.30974"
+#define FILE_VER_STRING "WI-T3.0.0.30974"
+#define LICENSE_VER_STRING "WI-T3.0.0.30974"
+#define FILE_VER_NUMBER 3, 0, 0, 30974
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30972"
+#define FB_BUILD_NO "30974"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-16 18:46:57 UTC (rev 59273)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-17 02:39:29 UTC (rev 59274)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30972
+BuildNum=30974
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-18 00:30:09
       | 
| Revision: 59279
          http://sourceforge.net/p/firebird/code/59279
Author:   firebirds
Date:     2014-03-18 00:30:06 +0000 (Tue, 18 Mar 2014)
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	2014-03-17 17:37:41 UTC (rev 59278)
+++ firebird/trunk/ChangeLog	2014-03-18 00:30:06 UTC (rev 59279)
@@ -1,3 +1,15 @@
+ 2014-03-17 17:37  dimitr 
+   M src/jrd/opt.cpp
+Fixed a regression in my recent commit, thanks to Adriano.
+
+ 2014-03-17 15:19  asfernandes 
+   M doc/sql.extensions/README.ddl_triggers.txt
+Complement DDL triggers documentation.
+
+ 2014-03-17 15:18  asfernandes 
+   M doc/sql.extensions/README.ddl_triggers.txt
+Complement DDL triggers documentation.
+
  2014-03-16 18:46  asfernandes 
    M src/jrd/Optimizer.h
    M src/jrd/opt.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-17 17:37:41 UTC (rev 59278)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-18 00:30:06 UTC (rev 59279)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30974
+  FORMAL BUILD NUMBER:30977
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30974"
-#define FILE_VER_STRING "WI-T3.0.0.30974"
-#define LICENSE_VER_STRING "WI-T3.0.0.30974"
-#define FILE_VER_NUMBER 3, 0, 0, 30974
+#define PRODUCT_VER_STRING "3.0.0.30977"
+#define FILE_VER_STRING "WI-T3.0.0.30977"
+#define LICENSE_VER_STRING "WI-T3.0.0.30977"
+#define FILE_VER_NUMBER 3, 0, 0, 30977
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30974"
+#define FB_BUILD_NO "30977"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-17 17:37:41 UTC (rev 59278)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-18 00:30:06 UTC (rev 59279)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30974
+BuildNum=30977
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-19 01:03:22
       | 
| Revision: 59283
          http://sourceforge.net/p/firebird/code/59283
Author:   firebirds
Date:     2014-03-19 01:03:18 +0000 (Wed, 19 Mar 2014)
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	2014-03-18 16:33:02 UTC (rev 59282)
+++ firebird/trunk/ChangeLog	2014-03-19 01:03:18 UTC (rev 59283)
@@ -1,3 +1,7 @@
+ 2014-03-18 16:33  asfernandes 
+   M src/jrd/trace/TraceObjects.h
+Warning.
+
  2014-03-17 17:37  dimitr 
    M src/jrd/opt.cpp
 Fixed a regression in my recent commit, thanks to Adriano.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-18 16:33:02 UTC (rev 59282)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-19 01:03:18 UTC (rev 59283)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30977
+  FORMAL BUILD NUMBER:30978
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30977"
-#define FILE_VER_STRING "WI-T3.0.0.30977"
-#define LICENSE_VER_STRING "WI-T3.0.0.30977"
-#define FILE_VER_NUMBER 3, 0, 0, 30977
+#define PRODUCT_VER_STRING "3.0.0.30978"
+#define FILE_VER_STRING "WI-T3.0.0.30978"
+#define LICENSE_VER_STRING "WI-T3.0.0.30978"
+#define FILE_VER_NUMBER 3, 0, 0, 30978
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30977"
+#define FB_BUILD_NO "30978"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-18 16:33:02 UTC (rev 59282)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-19 01:03:18 UTC (rev 59283)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30977
+BuildNum=30978
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-20 00:34:46
       | 
| Revision: 59290
          http://sourceforge.net/p/firebird/code/59290
Author:   firebirds
Date:     2014-03-20 00:34:42 +0000 (Thu, 20 Mar 2014)
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	2014-03-19 22:31:50 UTC (rev 59289)
+++ firebird/trunk/ChangeLog	2014-03-20 00:34:42 UTC (rev 59290)
@@ -1,3 +1,22 @@
+ 2014-03-19 22:31  hvlad 
+   M src/dsql/BoolNodes.cpp
+   M src/dsql/BoolNodes.h
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/ExprNodes.h
+Additional patch for CORE-3362 : Cursors should ignore changes made by the same statement:
+- fixed error when "NOT IN" expression is turned into (better optimized) equivalent expression: 
+  new RseBoolNode's lost parentForNode member (required later to [not]set stable cursor savepoint)
+- replaced pointer to outer ForNode (parentForNode) by boolean flag (ownSavepoint) - it simplifies cloning of nodes
+
+ 2014-03-19 16:19  asfernandes 
+   M src/yvalve/YObjects.h
+   M src/yvalve/why.cpp
+Warnings.
+
+ 2014-03-19 16:19  asfernandes 
+   M src/isql/isql.epp
+Revert the behavior of SHOW command without a database connection. It makes sense for SHOW SQL DIALECT.
+
  2014-03-18 16:33  asfernandes 
    M src/jrd/trace/TraceObjects.h
 Warning.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-19 22:31:50 UTC (rev 59289)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-20 00:34:42 UTC (rev 59290)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30978
+  FORMAL BUILD NUMBER:30981
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30978"
-#define FILE_VER_STRING "WI-T3.0.0.30978"
-#define LICENSE_VER_STRING "WI-T3.0.0.30978"
-#define FILE_VER_NUMBER 3, 0, 0, 30978
+#define PRODUCT_VER_STRING "3.0.0.30981"
+#define FILE_VER_STRING "WI-T3.0.0.30981"
+#define LICENSE_VER_STRING "WI-T3.0.0.30981"
+#define FILE_VER_NUMBER 3, 0, 0, 30981
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30978"
+#define FB_BUILD_NO "30981"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-19 22:31:50 UTC (rev 59289)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-20 00:34:42 UTC (rev 59290)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30978
+BuildNum=30981
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <ro...@us...> - 2014-03-21 23:04:01
       | 
| Revision: 59293
          http://sourceforge.net/p/firebird/code/59293
Author:   robocop
Date:     2014-03-21 23:03:56 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
Misc.
Modified Paths:
--------------
    firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt
    firebird/trunk/src/dsql/ExprNodes.cpp
    firebird/trunk/src/jrd/opt.cpp
Modified: firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt
===================================================================
--- firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt	2014-03-21 18:57:41 UTC (rev 59292)
+++ firebird/trunk/doc/sql.extensions/README.ddl_triggers.txt	2014-03-21 23:03:56 UTC (rev 59293)
@@ -91,7 +91,7 @@
 	   FUNCTION} triggers.
 
 Notes:
-	1) COMMENT ON, GRANT, REVOKE and ALTER DATABASE does not fire DDL triggers.
+	1) COMMENT ON, GRANT, REVOKE and ALTER DATABASE do not fire DDL triggers.
 
 Utilities support:
 	DDL triggers is a type of database triggers, so the parameters -nodbtriggers (GBAK and ISQL)
Modified: firebird/trunk/src/dsql/ExprNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/ExprNodes.cpp	2014-03-21 18:57:41 UTC (rev 59292)
+++ firebird/trunk/src/dsql/ExprNodes.cpp	2014-03-21 23:03:56 UTC (rev 59293)
@@ -1508,7 +1508,7 @@
 
 	const SLONG l1 = MOV_get_long(desc, node->nodScale);
 	const SINT64 l2 = MOV_get_long(&value->vlu_desc, node->nodScale);
-	SINT64 rc = (blrOp == blr_subtract) ? l2 - l1 : l2 + l1;
+	const SINT64 rc = (blrOp == blr_subtract) ? l2 - l1 : l2 + l1;
 
 	if (rc < MIN_SLONG || rc > MAX_SLONG)
 		ERR_post(Arg::Gds(isc_exception_integer_overflow));
@@ -10395,7 +10395,8 @@
 		csb->csb_blr_reader.setPos(savePos);
 		return SysFuncCallNode::parse(tdbb, pool, csb, blr_sys_function);
 	}
-	else if (blrOp == blr_subfunc)
+
+	if (blrOp == blr_subfunc)
 	{
 		DeclareSubFuncNode* declareNode;
 		if (csb->subFunctions.get(name.identifier, declareNode))
Modified: firebird/trunk/src/jrd/opt.cpp
===================================================================
--- firebird/trunk/src/jrd/opt.cpp	2014-03-21 18:57:41 UTC (rev 59292)
+++ firebird/trunk/src/jrd/opt.cpp	2014-03-21 23:03:56 UTC (rev 59293)
@@ -689,7 +689,7 @@
 			nodeBase = opt->opt_base_conjuncts;
 		}
 
-		fb_assert(nodeBase >= 0 && j >= 0);
+		fb_assert(nodeBase >= 0 && j >= 0 && nodeBase + j < MAX_CONJUNCTS);
 		opt->opt_conjuncts[nodeBase + j].opt_conjunct_node = node;
 	}
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-22 00:39:42
       | 
| Revision: 59295
          http://sourceforge.net/p/firebird/code/59295
Author:   firebirds
Date:     2014-03-22 00:39:38 +0000 (Sat, 22 Mar 2014)
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	2014-03-21 23:05:56 UTC (rev 59294)
+++ firebird/trunk/ChangeLog	2014-03-22 00:39:38 UTC (rev 59295)
@@ -1,3 +1,19 @@
+ 2014-03-21 23:05  robocop 
+   M src/remote/server/os/win32/property.cpp
+   M src/remote/server/os/win32/property.rc
+   M src/remote/server/os/win32/property.rh
+Windows only: I prefer to know from the properties dialog when the Server is using the -m startup option.
+
+ 2014-03-21 23:03  robocop 
+   M doc/sql.extensions/README.ddl_triggers.txt
+   M src/dsql/ExprNodes.cpp
+   M src/jrd/opt.cpp
+Misc.
+
+ 2014-03-21 18:57  dimitr 
+   M src/jrd/Optimizer.cpp
+This should fix the regression reported in fb-devel.
+
  2014-03-19 22:31  hvlad 
    M src/dsql/BoolNodes.cpp
    M src/dsql/BoolNodes.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-21 23:05:56 UTC (rev 59294)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-22 00:39:38 UTC (rev 59295)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30981
+  FORMAL BUILD NUMBER:30984
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30981"
-#define FILE_VER_STRING "WI-T3.0.0.30981"
-#define LICENSE_VER_STRING "WI-T3.0.0.30981"
-#define FILE_VER_NUMBER 3, 0, 0, 30981
+#define PRODUCT_VER_STRING "3.0.0.30984"
+#define FILE_VER_STRING "WI-T3.0.0.30984"
+#define LICENSE_VER_STRING "WI-T3.0.0.30984"
+#define FILE_VER_NUMBER 3, 0, 0, 30984
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30981"
+#define FB_BUILD_NO "30984"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-21 23:05:56 UTC (rev 59294)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-22 00:39:38 UTC (rev 59295)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30981
+BuildNum=30984
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-23 00:31:56
       | 
| Revision: 59305
          http://sourceforge.net/p/firebird/code/59305
Author:   firebirds
Date:     2014-03-23 00:31:53 +0000 (Sun, 23 Mar 2014)
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	2014-03-22 20:56:13 UTC (rev 59304)
+++ firebird/trunk/ChangeLog	2014-03-23 00:31:53 UTC (rev 59305)
@@ -1,3 +1,31 @@
+ 2014-03-22 20:56  robocop 
+   M src/jrd/vio.cpp
+Misc.
+
+ 2014-03-22 20:51  robocop 
+   M src/common/classes/sparse_bitmap.h
+   M src/dsql/Parser.cpp
+   M src/jrd/Optimizer.cpp
+   M src/jrd/extds/ExtDS.cpp
+   M src/jrd/jrd.cpp
+   M src/jrd/met.epp
+   M src/jrd/os/vms/vmslock.cpp
+   M src/jrd/pag.cpp
+   M src/jrd/recsrc/FullTableScan.cpp
+   M src/jrd/sdw.cpp
+   M src/jrd/shut.cpp
+   M src/jrd/svc.cpp
+   M src/jrd/tra.cpp
+   M src/jrd/validation.cpp
+   M src/lock/lock.cpp
+   M src/qli/expand.cpp
+   M src/qli/picstr.cpp
+Misc.
+
+ 2014-03-22 16:54  dimitr 
+   M src/remote/server/os/win32/property.rc
+More correct textual description.
+
  2014-03-21 23:05  robocop 
    M src/remote/server/os/win32/property.cpp
    M src/remote/server/os/win32/property.rc
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-22 20:56:13 UTC (rev 59304)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-23 00:31:53 UTC (rev 59305)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30984
+  FORMAL BUILD NUMBER:30987
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30984"
-#define FILE_VER_STRING "WI-T3.0.0.30984"
-#define LICENSE_VER_STRING "WI-T3.0.0.30984"
-#define FILE_VER_NUMBER 3, 0, 0, 30984
+#define PRODUCT_VER_STRING "3.0.0.30987"
+#define FILE_VER_STRING "WI-T3.0.0.30987"
+#define LICENSE_VER_STRING "WI-T3.0.0.30987"
+#define FILE_VER_NUMBER 3, 0, 0, 30987
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30984"
+#define FB_BUILD_NO "30987"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-22 20:56:13 UTC (rev 59304)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-23 00:31:53 UTC (rev 59305)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30984
+BuildNum=30987
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-25 01:04:15
       | 
| Revision: 59310
          http://sourceforge.net/p/firebird/code/59310
Author:   firebirds
Date:     2014-03-25 01:04:11 +0000 (Tue, 25 Mar 2014)
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	2014-03-24 14:29:02 UTC (rev 59309)
+++ firebird/trunk/ChangeLog	2014-03-25 01:04:11 UTC (rev 59310)
@@ -1,3 +1,7 @@
+ 2014-03-24 09:46  alexpeshkoff 
+   M src/common/classes/sparse_bitmap.h
+fixed build
+
  2014-03-22 20:56  robocop 
    M src/jrd/vio.cpp
 Misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-24 14:29:02 UTC (rev 59309)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-25 01:04:11 UTC (rev 59310)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30987
+  FORMAL BUILD NUMBER:30988
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30987"
-#define FILE_VER_STRING "WI-T3.0.0.30987"
-#define LICENSE_VER_STRING "WI-T3.0.0.30987"
-#define FILE_VER_NUMBER 3, 0, 0, 30987
+#define PRODUCT_VER_STRING "3.0.0.30988"
+#define FILE_VER_STRING "WI-T3.0.0.30988"
+#define LICENSE_VER_STRING "WI-T3.0.0.30988"
+#define FILE_VER_NUMBER 3, 0, 0, 30988
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30987"
+#define FB_BUILD_NO "30988"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-24 14:29:02 UTC (rev 59309)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-25 01:04:11 UTC (rev 59310)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30987
+BuildNum=30988
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-26 00:49:52
       | 
| Revision: 59316
          http://sourceforge.net/p/firebird/code/59316
Author:   firebirds
Date:     2014-03-26 00:49:49 +0000 (Wed, 26 Mar 2014)
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	2014-03-25 14:43:14 UTC (rev 59315)
+++ firebird/trunk/ChangeLog	2014-03-26 00:49:49 UTC (rev 59316)
@@ -1,3 +1,21 @@
+ 2014-03-25 14:43  dimitr 
+   M src/jrd/opt.cpp
+   M src/jrd/recsrc/IndexTableScan.cpp
+   M src/jrd/recsrc/RecordSource.h
+Allowed conditional bitmap scans for the index navigation.
+
+ 2014-03-25 13:52  dimitr 
+   M src/dsql/StmtNodes.cpp
+Cleanup.
+
+ 2014-03-25 13:51  dimitr 
+   M src/jrd/Function.epp
+   M src/jrd/jrd.h
+   M src/jrd/met.epp
+   M src/jrd/met_proto.h
+   M src/jrd/recsrc/ProcedureScan.cpp
+Fixed CORE-4371: Create function/sp which references to non-existent exception: error message is "Error while parsing function's BLR" instead of "exception not defined".
+
  2014-03-24 09:46  alexpeshkoff 
    M src/common/classes/sparse_bitmap.h
 fixed build
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-25 14:43:14 UTC (rev 59315)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-26 00:49:49 UTC (rev 59316)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30988
+  FORMAL BUILD NUMBER:30991
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30988"
-#define FILE_VER_STRING "WI-T3.0.0.30988"
-#define LICENSE_VER_STRING "WI-T3.0.0.30988"
-#define FILE_VER_NUMBER 3, 0, 0, 30988
+#define PRODUCT_VER_STRING "3.0.0.30991"
+#define FILE_VER_STRING "WI-T3.0.0.30991"
+#define LICENSE_VER_STRING "WI-T3.0.0.30991"
+#define FILE_VER_NUMBER 3, 0, 0, 30991
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30988"
+#define FB_BUILD_NO "30991"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-25 14:43:14 UTC (rev 59315)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-26 00:49:49 UTC (rev 59316)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30988
+BuildNum=30991
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <asf...@us...> - 2014-03-26 16:56:01
       | 
| Revision: 59321
          http://sourceforge.net/p/firebird/code/59321
Author:   asfernandes
Date:     2014-03-26 16:55:57 +0000 (Wed, 26 Mar 2014)
Log Message:
-----------
Fixed CORE-4373 - Duplicate names in package are not checked.
Modified Paths:
--------------
    firebird/trunk/lang_helpers/gds_codes.ftn
    firebird/trunk/lang_helpers/gds_codes.pas
    firebird/trunk/src/dsql/PackageNodes.epp
    firebird/trunk/src/include/gen/codetext.h
    firebird/trunk/src/include/gen/iberror.h
    firebird/trunk/src/include/gen/msgs.h
    firebird/trunk/src/include/gen/sql_code.h
    firebird/trunk/src/include/gen/sql_state.h
    firebird/trunk/src/msgs/facilities2.sql
    firebird/trunk/src/msgs/messages2.sql
    firebird/trunk/src/msgs/system_errors2.sql
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/lang_helpers/gds_codes.ftn	2014-03-26 16:55:57 UTC (rev 59321)
@@ -1814,6 +1814,8 @@
       PARAMETER (GDS__dyn_domain_used_function         = 336068890)
       INTEGER*4 GDS__dyn_alter_user_no_clause        
       PARAMETER (GDS__dyn_alter_user_no_clause         = 336068891)
+      INTEGER*4 GDS__dyn_duplicate_package_item      
+      PARAMETER (GDS__dyn_duplicate_package_item       = 336068894)
       INTEGER*4 GDS__gbak_unknown_switch             
       PARAMETER (GDS__gbak_unknown_switch              = 336330753)
       INTEGER*4 GDS__gbak_page_size_missing          
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/lang_helpers/gds_codes.pas	2014-03-26 16:55:57 UTC (rev 59321)
@@ -914,6 +914,7 @@
 	gds_dyn_coll_used_function           = 336068889;
 	gds_dyn_domain_used_function         = 336068890;
 	gds_dyn_alter_user_no_clause         = 336068891;
+	gds_dyn_duplicate_package_item       = 336068894;
 	gds_gbak_unknown_switch              = 336330753;
 	gds_gbak_page_size_missing           = 336330754;
 	gds_gbak_page_size_toobig            = 336330755;
Modified: firebird/trunk/src/dsql/PackageNodes.epp
===================================================================
--- firebird/trunk/src/dsql/PackageNodes.epp	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/src/dsql/PackageNodes.epp	2014-03-26 16:55:57 UTC (rev 59321)
@@ -415,7 +415,17 @@
 			case CreateAlterPackageNode::Item::FUNCTION:
 				{
 					CreateAlterFunctionNode* const fun = (*items)[i].function;
+
+					if (functionNames.exist(fun->name))
+					{
+						status_exception::raise(
+							Arg::Gds(isc_no_meta_update) <<
+							Arg::Gds(isc_dyn_duplicate_package_item) <<
+								Arg::Str("FUNCTION") << Arg::Str(fun->name));
+					}
+
 					functionNames.add(fun->name);
+
 					fun->alter = true;
 					fun->package = name;
 					fun->dsqlPass(itemScratch);
@@ -425,7 +435,17 @@
 			case CreateAlterPackageNode::Item::PROCEDURE:
 				{
 					CreateAlterProcedureNode* const proc = (*items)[i].procedure;
+
+					if (procedureNames.exist(proc->name))
+					{
+						status_exception::raise(
+							Arg::Gds(isc_no_meta_update) <<
+							Arg::Gds(isc_dyn_duplicate_package_item) <<
+								Arg::Str("PROCEDURE") << Arg::Str(proc->name));
+					}
+
 					procedureNames.add(proc->name);
+
 					proc->alter = true;
 					proc->package = name;
 					proc->dsqlPass(itemScratch);
@@ -745,6 +765,8 @@
 
 	// process declaredItems and items
 	Array<CreateAlterPackageNode::Item>* arrays[] = {declaredItems, items};
+	SortedArray<MetaName> functionNames[FB_NELEM(arrays)];
+	SortedArray<MetaName> procedureNames[FB_NELEM(arrays)];
 
 	for (unsigned i = 0; i < FB_NELEM(arrays); ++i)
 	{
@@ -768,6 +790,17 @@
 				case CreateAlterPackageNode::Item::FUNCTION:
 					{
 						CreateAlterFunctionNode* const fun = (*arrays[i])[j].function;
+
+						if (functionNames[i].exist(fun->name))
+						{
+							status_exception::raise(
+								Arg::Gds(isc_no_meta_update) <<
+								Arg::Gds(isc_dyn_duplicate_package_item) <<
+									Arg::Str("FUNCTION") << Arg::Str(fun->name));
+						}
+
+						functionNames[i].add(fun->name);
+
 						fun->package = name;
 						fun->create = true;
 						if (arrays[i] == items)
@@ -779,6 +812,17 @@
 				case CreateAlterPackageNode::Item::PROCEDURE:
 					{
 						CreateAlterProcedureNode* const proc = (*arrays[i])[j].procedure;
+
+						if (procedureNames[i].exist(proc->name))
+						{
+							status_exception::raise(
+								Arg::Gds(isc_no_meta_update) <<
+								Arg::Gds(isc_dyn_duplicate_package_item) <<
+									Arg::Str("PROCEDURE") << Arg::Str(proc->name));
+						}
+
+						procedureNames[i].add(proc->name);
+
 						proc->package = name;
 						proc->create = true;
 						if (arrays[i] == items)
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/src/include/gen/codetext.h	2014-03-26 16:55:57 UTC (rev 59321)
@@ -903,6 +903,7 @@
 	{"dyn_coll_used_function", 336068889},
 	{"dyn_domain_used_function", 336068890},
 	{"dyn_alter_user_no_clause", 336068891},
+	{"dyn_duplicate_package_item", 336068894},
 	{"gbak_unknown_switch", 336330753},
 	{"gbak_page_size_missing", 336330754},
 	{"gbak_page_size_toobig", 336330755},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/src/include/gen/iberror.h	2014-03-26 16:55:57 UTC (rev 59321)
@@ -937,6 +937,7 @@
 const ISC_STATUS isc_dyn_coll_used_function           = 336068889L;
 const ISC_STATUS isc_dyn_domain_used_function         = 336068890L;
 const ISC_STATUS isc_dyn_alter_user_no_clause         = 336068891L;
+const ISC_STATUS isc_dyn_duplicate_package_item       = 336068894L;
 const ISC_STATUS isc_gbak_unknown_switch              = 336330753L;
 const ISC_STATUS isc_gbak_page_size_missing           = 336330754L;
 const ISC_STATUS isc_gbak_page_size_toobig            = 336330755L;
@@ -1253,7 +1254,7 @@
 const ISC_STATUS isc_trace_switch_param_miss          = 337182758L;
 const ISC_STATUS isc_trace_param_act_notcompat        = 337182759L;
 const ISC_STATUS isc_trace_mandatory_switch_miss      = 337182760L;
-const ISC_STATUS isc_err_max                          = 1197;
+const ISC_STATUS isc_err_max                          = 1198;
 
 #else /* c definitions */
 
@@ -2160,6 +2161,7 @@
 #define isc_dyn_coll_used_function           336068889L
 #define isc_dyn_domain_used_function         336068890L
 #define isc_dyn_alter_user_no_clause         336068891L
+#define isc_dyn_duplicate_package_item       336068894L
 #define isc_gbak_unknown_switch              336330753L
 #define isc_gbak_page_size_missing           336330754L
 #define isc_gbak_page_size_toobig            336330755L
@@ -2476,7 +2478,7 @@
 #define isc_trace_switch_param_miss          337182758L
 #define isc_trace_param_act_notcompat        337182759L
 #define isc_trace_mandatory_switch_miss      337182760L
-#define isc_err_max                          1197
+#define isc_err_max                          1198
 
 #endif
 
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/src/include/gen/msgs.h	2014-03-26 16:55:57 UTC (rev 59321)
@@ -906,6 +906,7 @@
 	{336068889, "Collation @1 is used in function @2 (parameter name @3) and cannot be dropped"},		/* dyn_coll_used_function */
 	{336068890, "Domain @1 is used in function @2 (parameter name @3) and cannot be dropped"},		/* dyn_domain_used_function */
 	{336068891, "ALTER USER requires at least one clause to be specified"},		/* dyn_alter_user_no_clause */
+	{336068894, "Duplicate @1 @2"},		/* dyn_duplicate_package_item */
 	{336330753, "found unknown switch"},		/* gbak_unknown_switch */
 	{336330754, "page size parameter missing"},		/* gbak_page_size_missing */
 	{336330755, "Page size specified (@1) greater than limit (16384 bytes)"},		/* gbak_page_size_toobig */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/src/include/gen/sql_code.h	2014-03-26 16:55:57 UTC (rev 59321)
@@ -902,6 +902,7 @@
 	{336068889, -901}, /* 281 dyn_coll_used_function */
 	{336068890, -901}, /* 282 dyn_domain_used_function */
 	{336068891, -901}, /* 283 dyn_alter_user_no_clause */
+	{336068894, -901}, /* 286 dyn_duplicate_package_item */
 	{336330753, -901}, /*   1 gbak_unknown_switch */
 	{336330754, -901}, /*   2 gbak_page_size_missing */
 	{336330755, -901}, /*   3 gbak_page_size_toobig */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/src/include/gen/sql_state.h	2014-03-26 16:55:57 UTC (rev 59321)
@@ -902,6 +902,7 @@
 	{336068889, "HY000"}, // 281 dyn_coll_used_function
 	{336068890, "HY000"}, // 282 dyn_domain_used_function
 	{336068891, "42000"}, // 283 dyn_alter_user_no_clause
+	{336068894, "42000"}, // 286 dyn_duplicate_package_item
 	{336330753, "00000"}, //   1 gbak_unknown_switch
 	{336330754, "00000"}, //   2 gbak_page_size_missing
 	{336330755, "00000"}, //   3 gbak_page_size_toobig
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/src/msgs/facilities2.sql	2014-03-26 16:55:57 UTC (rev 59321)
@@ -6,7 +6,7 @@
 ('2013-11-13 15:59:10', 'GFIX', 3, 122)
 ('1996-11-07 13:39:40', 'GPRE', 4, 1)
 ('2012-08-27 21:26:00', 'DSQL', 7, 33)
-('2013-09-05 12:40:00', 'DYN', 8, 286)
+('2014-03-26 12:27:00', 'DYN', 8, 287)
 ('1996-11-07 13:39:40', 'INSTALL', 10, 1)
 ('1996-11-07 13:38:41', 'TEST', 11, 4)
 ('2014-03-03 19:17:14', 'GBAK', 12, 353)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/src/msgs/messages2.sql	2014-03-26 16:55:57 UTC (rev 59321)
@@ -1907,6 +1907,7 @@
 ('dyn_alter_user_no_clause', 'CreateAlterUserNode', 'DdlNodes.epp', NULL, 8, 283, NULL, 'ALTER USER requires at least one clause to be specified', NULL, NULL);
 (NULL, 'DYN_delete_role', 'dyn_del.epp', NULL, 8, 284, NULL, 'Cannot delete system SQL role @1', NULL, NULL);
 (NULL, 'DdlNodes.epp', 'AlterRelationNode::modifyField', NULL, 8, 285, NULL, 'Column @1 is not an identity column', NULL, NULL);
+('dyn_duplicate_package_item', NULL, 'PackageNodes.epp', NULL, 8, 286, NULL, 'Duplicate @1 @2', NULL, NULL);
 COMMIT WORK;
 -- TEST
 (NULL, 'main', 'test.c', NULL, 11, 0, NULL, 'This is a modified text message', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql	2014-03-26 16:55:21 UTC (rev 59320)
+++ firebird/trunk/src/msgs/system_errors2.sql	2014-03-26 16:55:57 UTC (rev 59321)
@@ -891,6 +891,7 @@
 (-901, 'HY', '000', 8, 281, 'dyn_coll_used_function', NULL, NULL)
 (-901, 'HY', '000', 8, 282, 'dyn_domain_used_function', NULL, NULL)
 (-901, '42', '000', 8, 283, 'dyn_alter_user_no_clause', NULL, NULL)
+(-901, '42', '000', 8, 286, 'dyn_duplicate_package_item', NULL, NULL)
 --  GBAK
 (-901, '00', '000', 12, 1, 'gbak_unknown_switch', NULL, NULL)
 (-901, '00', '000', 12, 2, 'gbak_page_size_missing', NULL, NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-27 00:39:59
       | 
| Revision: 59326
          http://sourceforge.net/p/firebird/code/59326
Author:   firebirds
Date:     2014-03-27 00:39:56 +0000 (Thu, 27 Mar 2014)
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	2014-03-26 19:11:32 UTC (rev 59325)
+++ firebird/trunk/ChangeLog	2014-03-27 00:39:56 UTC (rev 59326)
@@ -1,3 +1,57 @@
+ 2014-03-26 19:11  robocop 
+   M src/jrd/dpm.epp
+   M src/jrd/shut.cpp
+Shortcut.
+
+ 2014-03-26 19:10  robocop 
+   M src/jrd/jrd.cpp
+Try to drop as many shadow files as possible.
+
+ 2014-03-26 19:10  robocop 
+   M src/dsql/ExprNodes.cpp
+   M src/jrd/CryptoManager.cpp
+   M src/jrd/opt.cpp
+   M src/jrd/par.cpp
+   M src/jrd/sdw.cpp
+   M src/remote/server/server.cpp
+Misc.
+
+ 2014-03-26 19:06  robocop 
+   M src/burp/mvol.cpp
+   M src/jrd/jrd.h
+   M src/jrd/recsrc/BufferedStream.cpp
+   M src/jrd/recsrc/IndexTableScan.cpp
+   M src/jrd/recsrc/RecordSource.h
+Warnings.
+
+ 2014-03-26 16:55  asfernandes 
+   M lang_helpers/gds_codes.ftn
+   M lang_helpers/gds_codes.pas
+   M src/dsql/PackageNodes.epp
+   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/msgs/facilities2.sql
+   M src/msgs/messages2.sql
+   M src/msgs/system_errors2.sql
+Fixed CORE-4373 - Duplicate names in package are not checked.
+
+ 2014-03-26 16:55  asfernandes 
+   M src/dsql/Nodes.h
+   M src/dsql/dsql.cpp
+   M src/dsql/dsql.h
+Fixed CORE-4376 - Preparation of erroneous DDL statement does not show the main command failed.
+
+ 2014-03-26 16:42  dimitr 
+   M src/dsql/StmtNodes.cpp
+Misc.
+
+ 2014-03-26 16:41  dimitr 
+   M src/jrd/val.h
+Fixed CORE-4375: Procedure executes infinitely if contains more than 32767 statements inside any BEGIN/END block.
+
  2014-03-25 14:43  dimitr 
    M src/jrd/opt.cpp
    M src/jrd/recsrc/IndexTableScan.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-26 19:11:32 UTC (rev 59325)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-27 00:39:56 UTC (rev 59326)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30991
+  FORMAL BUILD NUMBER:30999
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30991"
-#define FILE_VER_STRING "WI-T3.0.0.30991"
-#define LICENSE_VER_STRING "WI-T3.0.0.30991"
-#define FILE_VER_NUMBER 3, 0, 0, 30991
+#define PRODUCT_VER_STRING "3.0.0.30999"
+#define FILE_VER_STRING "WI-T3.0.0.30999"
+#define LICENSE_VER_STRING "WI-T3.0.0.30999"
+#define FILE_VER_NUMBER 3, 0, 0, 30999
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30991"
+#define FB_BUILD_NO "30999"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-26 19:11:32 UTC (rev 59325)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-27 00:39:56 UTC (rev 59326)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30991
+BuildNum=30999
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-28 01:41:55
       | 
| Revision: 59328
          http://sourceforge.net/p/firebird/code/59328
Author:   firebirds
Date:     2014-03-28 01:41:53 +0000 (Fri, 28 Mar 2014)
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	2014-03-27 15:18:59 UTC (rev 59327)
+++ firebird/trunk/ChangeLog	2014-03-28 01:41:53 UTC (rev 59328)
@@ -1,3 +1,7 @@
+ 2014-03-27 15:18  asfernandes 
+   M src/dsql/StmtNodes.cpp
+Fixed CORE-4374 - Truncation error when using EXECUTE STATEMENT with a blob.
+
  2014-03-26 19:11  robocop 
    M src/jrd/dpm.epp
    M src/jrd/shut.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-27 15:18:59 UTC (rev 59327)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-28 01:41:53 UTC (rev 59328)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30999
+  FORMAL BUILD NUMBER:31000
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30999"
-#define FILE_VER_STRING "WI-T3.0.0.30999"
-#define LICENSE_VER_STRING "WI-T3.0.0.30999"
-#define FILE_VER_NUMBER 3, 0, 0, 30999
+#define PRODUCT_VER_STRING "3.0.0.31000"
+#define FILE_VER_STRING "WI-T3.0.0.31000"
+#define LICENSE_VER_STRING "WI-T3.0.0.31000"
+#define FILE_VER_NUMBER 3, 0, 0, 31000
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30999"
+#define FB_BUILD_NO "31000"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-27 15:18:59 UTC (rev 59327)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-28 01:41:53 UTC (rev 59328)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30999
+BuildNum=31000
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <ro...@us...> - 2014-03-28 22:00:11
       | 
| Revision: 59330
          http://sourceforge.net/p/firebird/code/59330
Author:   robocop
Date:     2014-03-28 22:00:05 +0000 (Fri, 28 Mar 2014)
Log Message:
-----------
Do not take explicit locks on virtual/sys/temp tables using TPBs.
Modified Paths:
--------------
    firebird/trunk/lang_helpers/gds_codes.ftn
    firebird/trunk/lang_helpers/gds_codes.pas
    firebird/trunk/src/include/gen/codetext.h
    firebird/trunk/src/include/gen/iberror.h
    firebird/trunk/src/include/gen/msgs.h
    firebird/trunk/src/include/gen/sql_code.h
    firebird/trunk/src/include/gen/sql_state.h
    firebird/trunk/src/jrd/par.cpp
    firebird/trunk/src/jrd/tra.cpp
    firebird/trunk/src/msgs/facilities2.sql
    firebird/trunk/src/msgs/messages2.sql
    firebird/trunk/src/msgs/system_errors2.sql
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/lang_helpers/gds_codes.ftn	2014-03-28 22:00:05 UTC (rev 59330)
@@ -1556,6 +1556,12 @@
       PARAMETER (GDS__info_unprepared_stmt             = 335545071)
       INTEGER*4 GDS__idx_key_value                   
       PARAMETER (GDS__idx_key_value                    = 335545072)
+      INTEGER*4 GDS__forupdate_virtualtbl            
+      PARAMETER (GDS__forupdate_virtualtbl             = 335545073)
+      INTEGER*4 GDS__forupdate_systbl                
+      PARAMETER (GDS__forupdate_systbl                 = 335545074)
+      INTEGER*4 GDS__forupdate_temptbl               
+      PARAMETER (GDS__forupdate_temptbl                = 335545075)
       INTEGER*4 GDS__gfix_db_name                    
       PARAMETER (GDS__gfix_db_name                     = 335740929)
       INTEGER*4 GDS__gfix_invalid_sw                 
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/lang_helpers/gds_codes.pas	2014-03-28 22:00:05 UTC (rev 59330)
@@ -785,6 +785,9 @@
 	gds_auth_datalength                  = 335545070;
 	gds_info_unprepared_stmt             = 335545071;
 	gds_idx_key_value                    = 335545072;
+	gds_forupdate_virtualtbl             = 335545073;
+	gds_forupdate_systbl                 = 335545074;
+	gds_forupdate_temptbl                = 335545075;
 	gds_gfix_db_name                     = 335740929;
 	gds_gfix_invalid_sw                  = 335740930;
 	gds_gfix_incmp_sw                    = 335740932;
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/src/include/gen/codetext.h	2014-03-28 22:00:05 UTC (rev 59330)
@@ -774,6 +774,9 @@
 	{"auth_datalength", 335545070},
 	{"info_unprepared_stmt", 335545071},
 	{"idx_key_value", 335545072},
+	{"forupdate_virtualtbl", 335545073},
+	{"forupdate_systbl", 335545074},
+	{"forupdate_temptbl", 335545075},
 	{"gfix_db_name", 335740929},
 	{"gfix_invalid_sw", 335740930},
 	{"gfix_incmp_sw", 335740932},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/src/include/gen/iberror.h	2014-03-28 22:00:05 UTC (rev 59330)
@@ -808,6 +808,9 @@
 const ISC_STATUS isc_auth_datalength                  = 335545070L;
 const ISC_STATUS isc_info_unprepared_stmt             = 335545071L;
 const ISC_STATUS isc_idx_key_value                    = 335545072L;
+const ISC_STATUS isc_forupdate_virtualtbl             = 335545073L;
+const ISC_STATUS isc_forupdate_systbl                 = 335545074L;
+const ISC_STATUS isc_forupdate_temptbl                = 335545075L;
 const ISC_STATUS isc_gfix_db_name                     = 335740929L;
 const ISC_STATUS isc_gfix_invalid_sw                  = 335740930L;
 const ISC_STATUS isc_gfix_incmp_sw                    = 335740932L;
@@ -1254,7 +1257,7 @@
 const ISC_STATUS isc_trace_switch_param_miss          = 337182758L;
 const ISC_STATUS isc_trace_param_act_notcompat        = 337182759L;
 const ISC_STATUS isc_trace_mandatory_switch_miss      = 337182760L;
-const ISC_STATUS isc_err_max                          = 1198;
+const ISC_STATUS isc_err_max                          = 1201;
 
 #else /* c definitions */
 
@@ -2032,6 +2035,9 @@
 #define isc_auth_datalength                  335545070L
 #define isc_info_unprepared_stmt             335545071L
 #define isc_idx_key_value                    335545072L
+#define isc_forupdate_virtualtbl             335545073L
+#define isc_forupdate_systbl                 335545074L
+#define isc_forupdate_temptbl                335545075L
 #define isc_gfix_db_name                     335740929L
 #define isc_gfix_invalid_sw                  335740930L
 #define isc_gfix_incmp_sw                    335740932L
@@ -2478,7 +2484,7 @@
 #define isc_trace_switch_param_miss          337182758L
 #define isc_trace_param_act_notcompat        337182759L
 #define isc_trace_mandatory_switch_miss      337182760L
-#define isc_err_max                          1198
+#define isc_err_max                          1201
 
 #endif
 
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/src/include/gen/msgs.h	2014-03-28 22:00:05 UTC (rev 59330)
@@ -777,6 +777,9 @@
 	{335545070, "Client authentication plugin expected @2 bytes of @3 from server, got @1"},		/* auth_datalength */
 	{335545071, "Attempt to get information about an unprepared dynamic SQL statement."},		/* info_unprepared_stmt */
 	{335545072, "Problematic key value is @1"},		/* idx_key_value */
+	{335545073, "Cannot select virtual table @1 for update WITH LOCK"},		/* forupdate_virtualtbl */
+	{335545074, "Cannot select system table @1 for update WITH LOCK"},		/* forupdate_systbl */
+	{335545075, "Cannot select temporary table @1 for update WITH LOCK"},		/* forupdate_temptbl */
 	{335740929, "data base file name (@1) already given"},		/* gfix_db_name */
 	{335740930, "invalid switch @1"},		/* gfix_invalid_sw */
 	{335740932, "incompatible switch combination"},		/* gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/src/include/gen/sql_code.h	2014-03-28 22:00:05 UTC (rev 59330)
@@ -773,6 +773,9 @@
 	{335545070, -902}, /* 750 auth_datalength */
 	{335545071, -901}, /* 751 info_unprepared_stmt */
 	{335545072, -901}, /* 752 idx_key_value */
+	{335545073, -901}, /* 753 forupdate_virtualtbl */
+	{335545074, -901}, /* 754 forupdate_systbl */
+	{335545075, -901}, /* 755 forupdate_temptbl */
 	{335740929, -901}, /*   1 gfix_db_name */
 	{335740930, -901}, /*   2 gfix_invalid_sw */
 	{335740932, -901}, /*   4 gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/src/include/gen/sql_state.h	2014-03-28 22:00:05 UTC (rev 59330)
@@ -773,6 +773,9 @@
 	{335545070, "28000"}, // 750 auth_datalength
 	{335545071, "HY007"}, // 751 info_unprepared_stmt
 	{335545072, "HY007"}, // 752 idx_key_value
+	{335545073, "HY000"}, // 753 forupdate_virtualtbl
+	{335545074, "HY000"}, // 754 forupdate_systbl
+	{335545075, "HY000"}, // 755 forupdate_temptbl
 	{335740929, "00000"}, //   1 gfix_db_name
 	{335740930, "00000"}, //   2 gfix_invalid_sw
 	{335740932, "00000"}, //   4 gfix_incmp_sw
Modified: firebird/trunk/src/jrd/par.cpp
===================================================================
--- firebird/trunk/src/jrd/par.cpp	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/src/jrd/par.cpp	2014-03-28 22:00:05 UTC (rev 59330)
@@ -1402,6 +1402,22 @@
 			break;
 
 		case blr_writelock:
+			// PAR_parseRecordSource() called RelationSourceNode::parse() => MET_scan_relation().
+			for (size_t iter = 0; iter < rse->rse_relations.getCount(); ++iter)
+			{
+				const RecordSourceNode* subNode = rse->rse_relations[iter];
+				if (subNode->type != RelationSourceNode::TYPE)
+					continue;
+				const RelationSourceNode* relNode = static_cast<const RelationSourceNode*>(subNode);
+				const jrd_rel* relation = relNode->relation;
+				fb_assert(relation);
+				if (relation->isVirtual())
+					PAR_error(csb, Arg::Gds(isc_forupdate_virtualtbl) << relation->rel_name, false);
+				if (relation->isSystem())
+					PAR_error(csb, Arg::Gds(isc_forupdate_systbl) << relation->rel_name, false);
+				if (relation->isTemporary())
+					PAR_error(csb, Arg::Gds(isc_forupdate_temptbl) << relation->rel_name, false);
+			}
 			rse->flags |= RseNode::FLAG_WRITELOCK;
 			break;
 
Modified: firebird/trunk/src/jrd/tra.cpp
===================================================================
--- firebird/trunk/src/jrd/tra.cpp	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/src/jrd/tra.cpp	2014-03-28 22:00:05 UTC (rev 59330)
@@ -2021,9 +2021,8 @@
 					 Arg::Gds(isc_tpb_reserv_virtualtbl) << Arg::Str(relation_name));
 		}
 
-		// Reject explicit attempts to take locks on system tables, but RDB$ADMIN role
-		// can do that for whatever is needed.
-		if (relation->isSystem() && !tdbb->getAttachment()->locksmith())
+		// Reject explicit attempts to take locks on system tables.
+		if (relation->isSystem())
 		{
 			ERR_post(Arg::Gds(isc_bad_tpb_content) <<
 		    		 Arg::Gds(isc_tpb_reserv_systbl) << Arg::Str(relation_name));
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/src/msgs/facilities2.sql	2014-03-28 22:00:05 UTC (rev 59330)
@@ -1,7 +1,7 @@
 /* MAX_NUMBER is the next number to be used, always one more than the highest message number. */
 set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?);
 --
-('2013-12-26 14:52:00', 'JRD', 0, 753)
+('2014-03-26 22:42:01', 'JRD', 0, 756)
 ('2012-01-23 20:10:30', 'QLI', 1, 532)
 ('2013-11-13 15:59:10', 'GFIX', 3, 122)
 ('1996-11-07 13:39:40', 'GPRE', 4, 1)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/src/msgs/messages2.sql	2014-03-28 22:00:05 UTC (rev 59330)
@@ -860,6 +860,9 @@
 ('auth_datalength', NULL, NULL, NULL, 0, 750, NULL, 'Client authentication plugin expected @2 bytes of @3 from server, got @1', NULL, NULL);
 ('info_unprepared_stmt', NULL, NULL, NULL, 0, 751, NULL, 'Attempt to get information about an unprepared dynamic SQL statement.', NULL, NULL);
 ('idx_key_value', NULL, NULL, NULL, 0, 752, NULL, 'Problematic key value is @1', NULL, NULL);
+('forupdate_virtualtbl', 'PAR_rse', 'par.cpp', NULL, 0, 753, NULL, 'Cannot select virtual table @1 for update WITH LOCK', NULL, NULL)
+('forupdate_systbl', 'PAR_rse', 'par.cpp', NULL, 0, 754, NULL, 'Cannot select system table @1 for update WITH LOCK', NULL, NULL)
+('forupdate_temptbl', 'PAR_rse', 'par.cpp', NULL, 0, 755, NULL, 'Cannot select temporary table @1 for update WITH LOCK', NULL, NULL)
 -- QLI
 (NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL);
 (NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql	2014-03-28 16:55:52 UTC (rev 59329)
+++ firebird/trunk/src/msgs/system_errors2.sql	2014-03-28 22:00:05 UTC (rev 59330)
@@ -759,6 +759,9 @@
 (-902, '28', '000', 0, 750, 'auth_datalength', NULL, NULL);
 (-901, 'HY', '007', 0, 751, 'info_unprepared_stmt', NULL, NULL)
 (-901, 'HY', '007', 0, 752, 'idx_key_value', NULL, NULL)
+(-901, 'HY', '000', 0, 753, 'forupdate_virtualtbl', NULL, NULL)
+(-901, 'HY', '000', 0, 754, 'forupdate_systbl', NULL, NULL)
+(-901, 'HY', '000', 0, 755, 'forupdate_temptbl', NULL, NULL)
 -- GFIX
 (-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)
 (-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-29 00:39:14
       | 
| Revision: 59331
          http://sourceforge.net/p/firebird/code/59331
Author:   firebirds
Date:     2014-03-29 00:39:11 +0000 (Sat, 29 Mar 2014)
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	2014-03-28 22:00:05 UTC (rev 59330)
+++ firebird/trunk/ChangeLog	2014-03-29 00:39:11 UTC (rev 59331)
@@ -1,3 +1,18 @@
+ 2014-03-28 22:00  robocop 
+   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/par.cpp
+   M src/jrd/tra.cpp
+   M src/msgs/facilities2.sql
+   M src/msgs/messages2.sql
+   M src/msgs/system_errors2.sql
+Do not take explicit locks on virtual/sys/temp tables using TPBs.
+
  2014-03-27 15:18  asfernandes 
    M src/dsql/StmtNodes.cpp
 Fixed CORE-4374 - Truncation error when using EXECUTE STATEMENT with a blob.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-28 22:00:05 UTC (rev 59330)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-29 00:39:11 UTC (rev 59331)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31000
+  FORMAL BUILD NUMBER:31001
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31000"
-#define FILE_VER_STRING "WI-T3.0.0.31000"
-#define LICENSE_VER_STRING "WI-T3.0.0.31000"
-#define FILE_VER_NUMBER 3, 0, 0, 31000
+#define PRODUCT_VER_STRING "3.0.0.31001"
+#define FILE_VER_STRING "WI-T3.0.0.31001"
+#define LICENSE_VER_STRING "WI-T3.0.0.31001"
+#define FILE_VER_NUMBER 3, 0, 0, 31001
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31000"
+#define FB_BUILD_NO "31001"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-28 22:00:05 UTC (rev 59330)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-29 00:39:11 UTC (rev 59331)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31000
+BuildNum=31001
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2014-03-31 00:35:21
       | 
| Revision: 59339
          http://sourceforge.net/p/firebird/code/59339
Author:   firebirds
Date:     2014-03-31 00:35:17 +0000 (Mon, 31 Mar 2014)
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	2014-03-30 14:44:44 UTC (rev 59338)
+++ firebird/trunk/ChangeLog	2014-03-31 00:35:17 UTC (rev 59339)
@@ -1,3 +1,13 @@
+ 2014-03-30 12:59  dimitr 
+   M src/dsql/StmtNodes.cpp
+   M src/jrd/exe.h
+Fixed CORE-4379: Poor performance of explicit cursors containing correlated subqueries in the select list.
+
+ 2014-03-30 12:57  dimitr 
+   M src/jrd/Optimizer.h
+   M src/jrd/opt.cpp
+Moved the helper class to the public scope for reuse outside the optimizer.
+
  2014-03-28 22:00  robocop 
    M lang_helpers/gds_codes.ftn
    M lang_helpers/gds_codes.pas
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2014-03-30 14:44:44 UTC (rev 59338)
+++ firebird/trunk/src/jrd/build_no.h	2014-03-31 00:35:17 UTC (rev 59339)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31001
+  FORMAL BUILD NUMBER:31003
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31001"
-#define FILE_VER_STRING "WI-T3.0.0.31001"
-#define LICENSE_VER_STRING "WI-T3.0.0.31001"
-#define FILE_VER_NUMBER 3, 0, 0, 31001
+#define PRODUCT_VER_STRING "3.0.0.31003"
+#define FILE_VER_STRING "WI-T3.0.0.31003"
+#define LICENSE_VER_STRING "WI-T3.0.0.31003"
+#define FILE_VER_NUMBER 3, 0, 0, 31003
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31001"
+#define FB_BUILD_NO "31003"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 2"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2014-03-30 14:44:44 UTC (rev 59338)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2014-03-31 00:35:17 UTC (rev 59339)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31001
+BuildNum=31003
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 |