| 
      
      
      From: <fir...@us...> - 2013-06-07 00:32:30
       | 
| Revision: 58162
          http://sourceforge.net/p/firebird/code/58162
Author:   firebirds
Date:     2013-06-07 00:32:27 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-06 16:05:02 UTC (rev 58161)
+++ firebird/trunk/ChangeLog	2013-06-07 00:32:27 UTC (rev 58162)
@@ -1,3 +1,26 @@
+ 2013-06-06 16:05  asfernandes 
+   M examples/udr/UdrCppExample.cpp
+   M src/include/firebird/ExternalEngine.h
+   M src/include/firebird/UdrCppEngine.h
+UDR C++ interface and examples improvements.
+
+ 2013-06-06 15:07  alexpeshkoff 
+   M src/auth/SecureRemotePassword/srp.cpp
+Fixed one more incorrect GlobalPtr usage
+
+ 2013-06-06 12:29  alexpeshkoff 
+   M src/yvalve/PluginManager.cpp
+Do not use as GlobalPtr class with ctor which needs context pool (i.e. TLS object)
+
+ 2013-06-06 07:32  alexpeshkoff 
+   M src/jrd/event.cpp
+   M src/jrd/event_proto.h
+Fix mac build
+
+ 2013-06-05 12:56  alexpeshkoff 
+   M src/common/isc_sync.cpp
+Fix mac build
+
  2013-06-03 15:24  asfernandes 
    M examples/udr/UdrCppExample.cpp
 RAII improvements and better usage of initializer in UDR examples.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-06 16:05:02 UTC (rev 58161)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-07 00:32:27 UTC (rev 58162)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30435
+  FORMAL BUILD NUMBER:30440
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30435"
-#define FILE_VER_STRING "WI-T3.0.0.30435"
-#define LICENSE_VER_STRING "WI-T3.0.0.30435"
-#define FILE_VER_NUMBER 3, 0, 0, 30435
+#define PRODUCT_VER_STRING "3.0.0.30440"
+#define FILE_VER_STRING "WI-T3.0.0.30440"
+#define LICENSE_VER_STRING "WI-T3.0.0.30440"
+#define FILE_VER_NUMBER 3, 0, 0, 30440
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30435"
+#define FB_BUILD_NO "30440"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-06 16:05:02 UTC (rev 58161)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-07 00:32:27 UTC (rev 58162)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30435
+BuildNum=30440
 
 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...> - 2013-06-08 00:34:02
       | 
| Revision: 58173
          http://sourceforge.net/p/firebird/code/58173
Author:   firebirds
Date:     2013-06-08 00:33:58 +0000 (Sat, 08 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-07 10:50:54 UTC (rev 58172)
+++ firebird/trunk/ChangeLog	2013-06-08 00:33:58 UTC (rev 58173)
@@ -1,3 +1,8 @@
+ 2013-06-07 10:41  alexpeshkoff 
+   M src/burp/burp.cpp
+   M src/burp/restore.epp
+Fixed CORE-3942: Restore from gbak backup using service doesn't report an error
+
  2013-06-06 16:05  asfernandes 
    M examples/udr/UdrCppExample.cpp
    M src/include/firebird/ExternalEngine.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-07 10:50:54 UTC (rev 58172)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-08 00:33:58 UTC (rev 58173)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30440
+  FORMAL BUILD NUMBER:30441
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30440"
-#define FILE_VER_STRING "WI-T3.0.0.30440"
-#define LICENSE_VER_STRING "WI-T3.0.0.30440"
-#define FILE_VER_NUMBER 3, 0, 0, 30440
+#define PRODUCT_VER_STRING "3.0.0.30441"
+#define FILE_VER_STRING "WI-T3.0.0.30441"
+#define LICENSE_VER_STRING "WI-T3.0.0.30441"
+#define FILE_VER_NUMBER 3, 0, 0, 30441
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30440"
+#define FB_BUILD_NO "30441"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-07 10:50:54 UTC (rev 58172)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-08 00:33:58 UTC (rev 58173)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30440
+BuildNum=30441
 
 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...> - 2013-06-10 00:31:09
       | 
| Revision: 58177
          http://sourceforge.net/p/firebird/code/58177
Author:   firebirds
Date:     2013-06-10 00:31:05 +0000 (Mon, 10 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-09 02:30:17 UTC (rev 58176)
+++ firebird/trunk/ChangeLog	2013-06-10 00:31:05 UTC (rev 58177)
@@ -1,3 +1,11 @@
+ 2013-06-09 02:30  asfernandes 
+   M src/include/firebird/UdrCppEngine.h
+Correct UDR headers for when Firebird namespace is not 'used'.
+
+ 2013-06-09 02:07  asfernandes 
+   M doc/sql.extensions/README.window_functions.txt
+Correction.
+
  2013-06-07 10:41  alexpeshkoff 
    M src/burp/burp.cpp
    M src/burp/restore.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-09 02:30:17 UTC (rev 58176)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-10 00:31:05 UTC (rev 58177)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30441
+  FORMAL BUILD NUMBER:30443
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30441"
-#define FILE_VER_STRING "WI-T3.0.0.30441"
-#define LICENSE_VER_STRING "WI-T3.0.0.30441"
-#define FILE_VER_NUMBER 3, 0, 0, 30441
+#define PRODUCT_VER_STRING "3.0.0.30443"
+#define FILE_VER_STRING "WI-T3.0.0.30443"
+#define LICENSE_VER_STRING "WI-T3.0.0.30443"
+#define FILE_VER_NUMBER 3, 0, 0, 30443
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30441"
+#define FB_BUILD_NO "30443"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-09 02:30:17 UTC (rev 58176)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-10 00:31:05 UTC (rev 58177)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30441
+BuildNum=30443
 
 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...> - 2013-06-12 00:27:54
       | 
| Revision: 58183
          http://sourceforge.net/p/firebird/code/58183
Author:   firebirds
Date:     2013-06-12 00:27:50 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-11 15:57:30 UTC (rev 58182)
+++ firebird/trunk/ChangeLog	2013-06-12 00:27:50 UTC (rev 58183)
@@ -1,3 +1,11 @@
+ 2013-06-11 15:57  asfernandes 
+   M src/plugins/udr_engine/UdrEngine.cpp
+Misc
+
+ 2013-06-11 12:29  alexpeshkoff 
+   A doc/README.providers.html
+More docs
+
  2013-06-09 02:30  asfernandes 
    M src/include/firebird/UdrCppEngine.h
 Correct UDR headers for when Firebird namespace is not 'used'.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-11 15:57:30 UTC (rev 58182)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-12 00:27:50 UTC (rev 58183)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30443
+  FORMAL BUILD NUMBER:30445
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30443"
-#define FILE_VER_STRING "WI-T3.0.0.30443"
-#define LICENSE_VER_STRING "WI-T3.0.0.30443"
-#define FILE_VER_NUMBER 3, 0, 0, 30443
+#define PRODUCT_VER_STRING "3.0.0.30445"
+#define FILE_VER_STRING "WI-T3.0.0.30445"
+#define LICENSE_VER_STRING "WI-T3.0.0.30445"
+#define FILE_VER_NUMBER 3, 0, 0, 30445
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30443"
+#define FB_BUILD_NO "30445"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-11 15:57:30 UTC (rev 58182)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-12 00:27:50 UTC (rev 58183)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30443
+BuildNum=30445
 
 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...> - 2013-06-17 00:27:11
       | 
| Revision: 58196
          http://sourceforge.net/p/firebird/code/58196
Author:   firebirds
Date:     2013-06-17 00:27:06 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-16 23:05:41 UTC (rev 58195)
+++ firebird/trunk/ChangeLog	2013-06-17 00:27:06 UTC (rev 58196)
@@ -1,3 +1,36 @@
+ 2013-06-16 23:05  asfernandes 
+   M src/dsql/Parser.cpp
+   M src/dsql/Parser.h
+   M src/jrd/Attachment.cpp
+   M src/jrd/Attachment.h
+Fixed CORE-4119 - Metadata source becomes wrong after twice transliteration to the metadata charset.
+
+ 2013-06-16 21:41  hvlad 
+   M src/jrd/cch.cpp
+   M src/jrd/cch.h
+Implement wait with timeout for page buffer's latches.
+Note, engine passes timeout as negative seconds, while sync objects works with positive milliseconds.
+
+ 2013-06-16 21:28  hvlad 
+   M src/common/classes/SyncObject.cpp
+   M src/common/classes/SyncObject.h
+A cleanup and a few improvements :
+- ability to wait with finite timeout
+- separate counts of waiting readers and writers
+- two interlocked operations are needed when lock granted to a waiting readers (despite of its amount)
+
+ 2013-06-16 21:21  hvlad 
+   M src/common/classes/Synchronize.cpp
+misc
+
+ 2013-06-15 14:12  dimitr 
+   M src/jrd/jrd.cpp
+Protection against the not supported mode. I used a non-translatable error because it might be a temporary measure, time will show.
+
+ 2013-06-15 06:08  dimitr 
+   M src/jrd/event.cpp
+Fixed Windows build.
+
  2013-06-11 15:57  asfernandes 
    M src/plugins/udr_engine/UdrEngine.cpp
 Misc
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-16 23:05:41 UTC (rev 58195)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-17 00:27:06 UTC (rev 58196)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30445
+  FORMAL BUILD NUMBER:30451
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30445"
-#define FILE_VER_STRING "WI-T3.0.0.30445"
-#define LICENSE_VER_STRING "WI-T3.0.0.30445"
-#define FILE_VER_NUMBER 3, 0, 0, 30445
+#define PRODUCT_VER_STRING "3.0.0.30451"
+#define FILE_VER_STRING "WI-T3.0.0.30451"
+#define LICENSE_VER_STRING "WI-T3.0.0.30451"
+#define FILE_VER_NUMBER 3, 0, 0, 30451
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30445"
+#define FB_BUILD_NO "30451"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-16 23:05:41 UTC (rev 58195)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-17 00:27:06 UTC (rev 58196)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30445
+BuildNum=30451
 
 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...> - 2013-06-18 00:25:10
       | 
| Revision: 58199
          http://sourceforge.net/p/firebird/code/58199
Author:   firebirds
Date:     2013-06-18 00:25:06 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-17 01:32:09 UTC (rev 58198)
+++ firebird/trunk/ChangeLog	2013-06-18 00:25:06 UTC (rev 58199)
@@ -1,3 +1,13 @@
+ 2013-06-17 01:32  asfernandes 
+   M doc/README.interfaces.html
+   M doc/README.providers.html
+Misc.
+
+ 2013-06-17 01:13  asfernandes 
+   M src/common/classes/SyncObject.cpp
+   M src/common/classes/SyncObject.h
+Misc.
+
  2013-06-16 23:05  asfernandes 
    M src/dsql/Parser.cpp
    M src/dsql/Parser.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-17 01:32:09 UTC (rev 58198)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-18 00:25:06 UTC (rev 58199)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30451
+  FORMAL BUILD NUMBER:30453
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30451"
-#define FILE_VER_STRING "WI-T3.0.0.30451"
-#define LICENSE_VER_STRING "WI-T3.0.0.30451"
-#define FILE_VER_NUMBER 3, 0, 0, 30451
+#define PRODUCT_VER_STRING "3.0.0.30453"
+#define FILE_VER_STRING "WI-T3.0.0.30453"
+#define LICENSE_VER_STRING "WI-T3.0.0.30453"
+#define FILE_VER_NUMBER 3, 0, 0, 30453
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30451"
+#define FB_BUILD_NO "30453"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-17 01:32:09 UTC (rev 58198)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-18 00:25:06 UTC (rev 58199)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30451
+BuildNum=30453
 
 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...> - 2013-06-18 15:50:52
       | 
| Revision: 58203
          http://sourceforge.net/p/firebird/code/58203
Author:   asfernandes
Date:     2013-06-18 15:50:48 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Improvements and corrections to message builder and UDR.
Modified Paths:
--------------
    firebird/trunk/examples/udr/UdrCppExample.cpp
    firebird/trunk/src/common/MsgMetadata.cpp
    firebird/trunk/src/common/MsgMetadata.h
    firebird/trunk/src/common/classes/InternalMessageBuffer.cpp
    firebird/trunk/src/dsql/dsql.cpp
    firebird/trunk/src/include/firebird/Message.h
    firebird/trunk/src/include/firebird/Provider.h
    firebird/trunk/src/jrd/ExtEngineManager.cpp
    firebird/trunk/src/jrd/PreparedStatement.cpp
    firebird/trunk/src/jrd/Routine.cpp
    firebird/trunk/src/remote/client/BlrFromMessage.cpp
Modified: firebird/trunk/examples/udr/UdrCppExample.cpp
===================================================================
--- firebird/trunk/examples/udr/UdrCppExample.cpp	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/examples/udr/UdrCppExample.cpp	2013-06-18 15:50:48 UTC (rev 58203)
@@ -690,7 +690,7 @@
 	FB_TRIGGER_MESSAGE(FieldsMessage,
 		(FB_INTEGER, id, "ID")
 		(FB_BLOB, info, "INFO")
-		(FB_VARCHAR(60 * 4), address, "ADDRESS")
+		///(FB_VARCHAR(60 * 4), address, "ADDRESS")
 		(FB_VARCHAR(60 * 4), name, "NAME")
 	);
 
@@ -753,13 +753,13 @@
 			"execute block (\n"
 			"    id type of column PERSONS.ID = ?,\n"
 			"    info type of column PERSONS.INFO = ?,\n"
-			"    address type of column PERSONS.ADDRESS = ?,\n"
+			///"    address type of column PERSONS.ADDRESS = ?,\n"
 			"    name type of column PERSONS.NAME = ?\n"
 			")"
 			"as\n"
 			"begin\n"
-			"    execute statement ('insert into persons (id, name, address, info)\n"
-			"        values (?, ?, ?, ?)') (:id, :name, :address, :info)\n"
+			"    execute statement ('insert into persons (id, name/***, address***/, info)\n"
+			"        values (?, ?/***, ?***/, ?)') (:id, :name/***, :address***/, :info)\n"
 			"        on external data source '");
 		strcat(buffer, outSqlDa->sqlvar[0].sqldata + sizeof(short));
 		strcat(buffer, "';\nend");
Modified: firebird/trunk/src/common/MsgMetadata.cpp
===================================================================
--- firebird/trunk/src/common/MsgMetadata.cpp	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/src/common/MsgMetadata.cpp	2013-06-18 15:50:48 UTC (rev 58203)
@@ -114,6 +114,21 @@
 		}
 	}
 
+	virtual void FB_CARG setCharSet(IStatus* status, unsigned index, unsigned charSet)
+	{
+		try
+		{
+			MutexLockGuard g(mtx, FB_FUNCTION);
+
+			indexError(index, "setCharSet");
+			msgMetadata->items[index].charSet = charSet;
+		}
+		catch (const Exception& ex)
+		{
+			ex.stuffException(status);
+		}
+	}
+
 	virtual void FB_CARG setScale(IStatus* status, unsigned index, unsigned scale)
 	{
 		try
@@ -129,6 +144,23 @@
 		}
 	}
 
+	virtual void FB_CARG truncate(IStatus* status, unsigned count)
+	{
+		try
+		{
+			MutexLockGuard g(mtx, FB_FUNCTION);
+
+			if (count != 0)
+				indexError(count - 1, "truncate");
+
+			msgMetadata->items.shrink(count);
+		}
+		catch (const Exception& ex)
+		{
+			ex.stuffException(status);
+		}
+	}
+
 	virtual void FB_CARG moveNameToIndex(IStatus* status, const char* name, unsigned index)
 	{
 		try
Modified: firebird/trunk/src/common/MsgMetadata.h
===================================================================
--- firebird/trunk/src/common/MsgMetadata.h	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/src/common/MsgMetadata.h	2013-06-18 15:50:48 UTC (rev 58203)
@@ -49,7 +49,7 @@
 			  subType(0),
 			  length(0),
 			  scale(0),
-			  charset(0),
+			  charSet(0),
 			  offset(0),
 			  nullInd(0),
 			  nullable(false),
@@ -66,7 +66,7 @@
 			  subType(v.subType),
 			  length(v.length),
 			  scale(v.scale),
-			  charset(v.charset),
+			  charSet(v.charSet),
 			  offset(v.offset),
 			  nullInd(v.nullInd),
 			  nullable(v.nullable),
@@ -82,7 +82,7 @@
 		unsigned subType;
 		unsigned length;
 		unsigned scale;
-		unsigned charset;
+		unsigned charSet;
 		unsigned offset;
 		unsigned nullInd;
 		bool nullable;
@@ -193,12 +193,12 @@
 		return 0;
 	}
 
-	virtual unsigned FB_CARG getCharset(IStatus* status, unsigned index) const
+	virtual unsigned FB_CARG getCharSet(IStatus* status, unsigned index) const
 	{
 		if (index < items.getCount())
-			return items[index].charset;
+			return items[index].charSet;
 
-		raiseIndexError(status, index, "getCharset");
+		raiseIndexError(status, index, "getCharSet");
 		return 0;
 	}
 
Modified: firebird/trunk/src/common/classes/InternalMessageBuffer.cpp
===================================================================
--- firebird/trunk/src/common/classes/InternalMessageBuffer.cpp	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/src/common/classes/InternalMessageBuffer.cpp	2013-06-18 15:50:48 UTC (rev 58203)
@@ -89,25 +89,25 @@
 		{
 		case blr_text:
 			item->type = SQL_TEXT;
-			item->charset = CS_dynamic;
+			item->charSet = CS_dynamic;
 			item->length = rdr.getWord();
 			break;
 
 		case blr_varying:
 			item->type = SQL_VARYING;
-			item->charset = CS_dynamic;
+			item->charSet = CS_dynamic;
 			item->length = rdr.getWord();
 			break;
 
 		case blr_text2:
 			item->type = SQL_TEXT;
-			item->charset = rdr.getWord();
+			item->charSet = rdr.getWord();
 			item->length = rdr.getWord();
 			break;
 
 		case blr_varying2:
 			item->type = SQL_VARYING;
-			item->charset = rdr.getWord();
+			item->charSet = rdr.getWord();
 			item->length = rdr.getWord();
 			break;
 
@@ -165,7 +165,7 @@
 			item->type = SQL_BLOB;
 			item->length = sizeof(ISC_QUAD);
 			item->subType = rdr.getWord();
-			item->charset = rdr.getWord();
+			item->charSet = rdr.getWord();
 			break;
 
 		case blr_bool:
Modified: firebird/trunk/src/dsql/dsql.cpp
===================================================================
--- firebird/trunk/src/dsql/dsql.cpp	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/src/dsql/dsql.cpp	2013-06-18 15:50:48 UTC (rev 58203)
@@ -1266,7 +1266,7 @@
 		check(&st);
 		desc.dsc_sub_type = meta->getSubType(&st, index);
 		check(&st);
-		unsigned textType = meta->getCharset(&st, index);
+		unsigned textType = meta->getCharSet(&st, index);
 		check(&st);
 		desc.setTextType(textType);
 		desc.dsc_address = (UCHAR*)(IPTR) dataOffset;
Modified: firebird/trunk/src/include/firebird/Message.h
===================================================================
--- firebird/trunk/src/include/firebird/Message.h	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/src/include/firebird/Message.h	2013-06-18 15:50:48 UTC (rev 58203)
@@ -58,9 +58,8 @@
 		static void setup(::Firebird::IStatus* status, ::Firebird::IMetadataBuilder* builder)	\
 		{	\
 			unsigned index = 0;	\
+			moveNames	\
 			FB_BOOST_PP_SEQ_FOR_EACH_I(FB__MESSAGE_META, size, fields)	\
-			\
-			moveNames	\
 		}	\
 		\
 		name(::Firebird::IMaster* master)	\
@@ -163,6 +162,16 @@
 	builder->setType(status, index, SQL_VARYING);	\
 	builder->setLength(status, index, len);
 
+#define FB__META_FB_INTL_CHAR(len, charSet)	\
+	builder->setType(status, index, SQL_TEXT);	\
+	builder->setLength(status, index, len);	\
+	builder->setCharSet(status, index, charSet);
+
+#define FB__META_FB_INTL_VARCHAR(len, charSet)	\
+	builder->setType(status, index, SQL_VARYING);	\
+	builder->setLength(status, index, len);	\
+	builder->setCharSet(status, index, charSet);
+
 #define FB__META_FB_SMALLINT			FB__META_FB_SCALED_SMALLINT(0)
 #define FB__META_FB_INTEGER				FB__META_FB_SCALED_INTEGER(0)
 #define FB__META_FB_BIGINT				FB__META_FB_SCALED_BIGINT(0)
@@ -194,8 +203,9 @@
 #define FB_TRIGGER_MESSAGE_MOVE_NAMES_Y0
 
 #define FB_TRIGGER_MESSAGE_MOVE_NAMES_I(name, size, fields)	\
-	index = 0;	\
-	FB_BOOST_PP_SEQ_FOR_EACH_I(FB_TRIGGER_MESSAGE_MOVE_NAME, size, fields)
+	FB_BOOST_PP_SEQ_FOR_EACH_I(FB_TRIGGER_MESSAGE_MOVE_NAME, size, fields)	\
+	builder->truncate(status, index);	\
+	index = 0;
 
 #define FB_TRIGGER_MESSAGE_MOVE_NAME(r, _, i, xy)	\
 	builder->moveNameToIndex(status, FB_BOOST_PP_TUPLE_ELEM(_, 2, xy), index++);
Modified: firebird/trunk/src/include/firebird/Provider.h
===================================================================
--- firebird/trunk/src/include/firebird/Provider.h	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/src/include/firebird/Provider.h	2013-06-18 15:50:48 UTC (rev 58203)
@@ -103,7 +103,7 @@
 	virtual unsigned FB_CARG getSubType(IStatus* status, unsigned index) const = 0;
 	virtual unsigned FB_CARG getLength(IStatus* status, unsigned index) const = 0;
 	virtual unsigned FB_CARG getScale(IStatus* status, unsigned index) const = 0;
-	virtual unsigned FB_CARG getCharset(IStatus* status, unsigned index) const = 0;
+	virtual unsigned FB_CARG getCharSet(IStatus* status, unsigned index) const = 0;
 	virtual unsigned FB_CARG getOffset(IStatus* status, unsigned index) const = 0;
 	virtual unsigned FB_CARG getNullOffset(IStatus* status, unsigned index) const = 0;
 
@@ -118,13 +118,15 @@
 	virtual void FB_CARG setType(IStatus* status, unsigned index, unsigned type) = 0;
 	virtual void FB_CARG setSubType(IStatus* status, unsigned index, unsigned subType) = 0;
 	virtual void FB_CARG setLength(IStatus* status, unsigned index, unsigned length) = 0;
+	virtual void FB_CARG setCharSet(IStatus* status, unsigned index, unsigned charSet) = 0;
 	virtual void FB_CARG setScale(IStatus* status, unsigned index, unsigned scale) = 0;
 
+	virtual void FB_CARG truncate(IStatus* status, unsigned count) = 0;
 	virtual void FB_CARG moveNameToIndex(IStatus* status, const char* name, unsigned index) = 0;
 
 	virtual IMessageMetadata* FB_CARG getMetadata(IStatus* status) = 0;
 };
-#define FB_METADATA_BUILDER_VERSION (FB_REFCOUNTED_VERSION + 6)
+#define FB_METADATA_BUILDER_VERSION (FB_REFCOUNTED_VERSION + 8)
 
 class IResultSet : public IRefCounted
 {
Modified: firebird/trunk/src/jrd/ExtEngineManager.cpp
===================================================================
--- firebird/trunk/src/jrd/ExtEngineManager.cpp	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/src/jrd/ExtEngineManager.cpp	2013-06-18 15:50:48 UTC (rev 58203)
@@ -896,7 +896,7 @@
 
 		LocalStatus status;
 		trigger->execute(&status, attInfo->context, action,
-			(oldRpb ? oldMsg.begin() : NULL), (newRpb ? newMsg.begin() : NULL));
+			(oldMsg.hasData() ? oldMsg.begin() : NULL), (newMsg.hasData() ? newMsg.begin() : NULL));
 		status.check();
 	}
 
@@ -941,7 +941,7 @@
 		return;
 
 	UCHAR* p = msgBuffer.getBuffer(format->fmt_length);
-	///memset(p, 0, format->fmt_length);
+	memset(p, 0, format->fmt_length);
 
 	for (unsigned i = 0; i < format->fmt_count / 2; ++i)
 	{
Modified: firebird/trunk/src/jrd/PreparedStatement.cpp
===================================================================
--- firebird/trunk/src/jrd/PreparedStatement.cpp	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/src/jrd/PreparedStatement.cpp	2013-06-18 15:50:48 UTC (rev 58203)
@@ -54,13 +54,13 @@
 		{
 			case dtype_text:
 				item.type = SQL_TEXT;
-				item.charset = desc->dsc_ttype();
+				item.charSet = desc->dsc_ttype();
 				item.length = desc->dsc_length;
 				break;
 
 			case dtype_varying:
 				item.type = SQL_VARYING;
-				item.charset = desc->dsc_ttype();
+				item.charSet = desc->dsc_ttype();
 				fb_assert(desc->dsc_length >= sizeof(USHORT));
 				item.length = desc->dsc_length - sizeof(USHORT);
 				break;
@@ -123,7 +123,7 @@
 				item.type = SQL_BLOB;
 				item.length = sizeof(ISC_QUAD);
 				item.subType = desc->dsc_sub_type;
-				item.charset = desc->getTextType();
+				item.charSet = desc->getTextType();
 				break;
 
 			case dtype_boolean:
Modified: firebird/trunk/src/jrd/Routine.cpp
===================================================================
--- firebird/trunk/src/jrd/Routine.cpp	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/src/jrd/Routine.cpp	2013-06-18 15:50:48 UTC (rev 58203)
@@ -75,7 +75,7 @@
 		desc->dsc_length = descLength;
 		desc->dsc_scale = params->getScale(&status, i);
 		desc->dsc_sub_type = params->getSubType(&status, i);
-		desc->setTextType(params->getCharset(&status, i));
+		desc->setTextType(params->getCharSet(&status, i));
 		desc->dsc_address = (UCHAR*)(IPTR) descOffset;
 		desc->dsc_flags = (params->isNullable(&status, i) ? DSC_nullable : 0);
 
Modified: firebird/trunk/src/remote/client/BlrFromMessage.cpp
===================================================================
--- firebird/trunk/src/remote/client/BlrFromMessage.cpp	2013-06-18 13:17:08 UTC (rev 58202)
+++ firebird/trunk/src/remote/client/BlrFromMessage.cpp	2013-06-18 15:50:48 UTC (rev 58203)
@@ -105,14 +105,14 @@
 		checkStatus(&st);
 		unsigned scale = metadata->getScale(&st, i);
 		checkStatus(&st);
-		unsigned charset = metadata->getCharset(&st, i);
+		unsigned charSet = metadata->getCharSet(&st, i);
 		checkStatus(&st);
 
 		switch (dtype)
 		{
 			case SQL_VARYING:
 				appendUChar(blr_varying2);
-				appendUShort(charset);
+				appendUShort(charSet);
 				appendUShort(len);
 				dtype = dtype_varying;
 				len += sizeof(USHORT);
@@ -120,7 +120,7 @@
 
 			case SQL_TEXT:
 				appendUChar(blr_text2);
-				appendUShort(charset);
+				appendUShort(charSet);
 				appendUShort(len);
 				dtype = dtype_text;
 				break;
@@ -158,7 +158,7 @@
 			case SQL_BLOB:
 				appendUChar(blr_blob2);
 				appendUShort(metadata->getSubType(&st, i));
-				appendUShort(charset);
+				appendUShort(charSet);
 				dtype = dtype_blob;
 				break;
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2013-06-20 01:05:59
       | 
| Revision: 58212
          http://sourceforge.net/p/firebird/code/58212
Author:   firebirds
Date:     2013-06-20 01:05:54 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-19 16:18:06 UTC (rev 58211)
+++ firebird/trunk/ChangeLog	2013-06-20 01:05:54 UTC (rev 58212)
@@ -1,3 +1,65 @@
+ 2013-06-19 11:46  hvlad 
+   M src/jrd/tra.cpp
+   M src/jrd/tra.h
+Removed allocation of temp transaction object. 
+
+ 2013-06-19 09:14  dimitr 
+   M src/jrd/Function.epp
+   M src/jrd/met.epp
+A few corrections, mostly regarding new-style vs legacy UDFs.
+
+ 2013-06-19 09:14  dimitr 
+   M src/burp/restore.epp
+   M src/dsql/DdlNodes.epp
+   M src/jrd/dfw.epp
+A few corrections, mostly regarding new-style vs legacy UDFs.
+
+ 2013-06-19 06:26  dimitr 
+   M src/dsql/StmtNodes.cpp
+   M src/jrd/exe.cpp
+Attempted to fix a possible crash due to the wrong request pointer remaining in tdbb after sub-request execution. While being there, cleaned up some redundant code.
+
+ 2013-06-19 02:56  asfernandes 
+   M src/jrd/fun.epp
+Misc.
+
+ 2013-06-18 18:22  dimitr 
+   M src/burp/backup.epp
+   M src/burp/burp.h
+   M src/burp/restore.epp
+   M src/dsql/DdlNodes.epp
+   M src/dsql/DdlNodes.h
+   M src/dsql/parse.y
+   M src/include/gen/ids.h
+   M src/jrd/drq.h
+   M src/jrd/fields.h
+   M src/jrd/ini.epp
+   M src/jrd/names.h
+   M src/jrd/relations.h
+Made the ALTER SEQUENCE RESTART behavior standard compliant.
+
+ 2013-06-18 15:50  asfernandes 
+   M examples/udr/UdrCppExample.cpp
+   M src/common/MsgMetadata.cpp
+   M src/common/MsgMetadata.h
+   M src/common/classes/InternalMessageBuffer.cpp
+   M src/dsql/dsql.cpp
+   M src/include/firebird/Message.h
+   M src/include/firebird/Provider.h
+   M src/jrd/ExtEngineManager.cpp
+   M src/jrd/PreparedStatement.cpp
+   M src/jrd/Routine.cpp
+   M src/remote/client/BlrFromMessage.cpp
+Improvements and corrections to message builder and UDR.
+
+ 2013-06-18 13:16  alexpeshkoff 
+   M src/jrd/fun.epp
+Fixed CORE-4121: Segfault when engine is shutting down inside blob get/put function invoked from UDF
+
+ 2013-06-18 09:10  alexpeshkoff 
+   M src/jrd/jrd.cpp
+Fixed assertion when restoring DB in non-existtent path with overwrite - reported privately by Dmitry
+
  2013-06-17 01:32  asfernandes 
    M doc/README.interfaces.html
    M doc/README.providers.html
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-19 16:18:06 UTC (rev 58211)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-20 01:05:54 UTC (rev 58212)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30453
+  FORMAL BUILD NUMBER:30462
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30453"
-#define FILE_VER_STRING "WI-T3.0.0.30453"
-#define LICENSE_VER_STRING "WI-T3.0.0.30453"
-#define FILE_VER_NUMBER 3, 0, 0, 30453
+#define PRODUCT_VER_STRING "3.0.0.30462"
+#define FILE_VER_STRING "WI-T3.0.0.30462"
+#define LICENSE_VER_STRING "WI-T3.0.0.30462"
+#define FILE_VER_NUMBER 3, 0, 0, 30462
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30453"
+#define FB_BUILD_NO "30462"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Unstable"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-19 16:18:06 UTC (rev 58211)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-20 01:05:54 UTC (rev 58212)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30453
+BuildNum=30462
 
 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...> - 2013-06-21 00:28:40
       | 
| Revision: 58224
          http://sourceforge.net/p/firebird/code/58224
Author:   firebirds
Date:     2013-06-21 00:28:38 +0000 (Fri, 21 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-20 16:26:27 UTC (rev 58223)
+++ firebird/trunk/ChangeLog	2013-06-21 00:28:38 UTC (rev 58224)
@@ -1,3 +1,28 @@
+ 2013-06-20 16:26  dimitr 
+   M src/common/TextType.cpp
+Front ported the error code validation.
+
+ 2013-06-20 15:44  asfernandes 
+   M src/intl/lc_ascii.cpp
+Fixed CORE-2912 - Exception when upper casing string with lowercase y trema (code 0xFF in ISO8859_1)
+
+ 2013-06-20 09:16  mapopa 
+   M src/dsql/Nodes.h
+eliminate error: use 'template' keyword to treat 'as' as a dependent template name  http://stackoverflow.com/a/3786481/66242
+
+ 2013-06-20 08:32  dimitr 
+   M src/jrd/build_no.h
+   M src/misc/writeBuildNum.sh
+Getting prepared for Alpha 1.
+
+ 2013-06-20 08:04  dimitr 
+   M src/dsql/DdlNodes.epp
+A somewhat hackery solution that allows ISQL to work with SET GENERATOR as it expects. It fixes the issue reported by Philippe in fb-devel.
+
+ 2013-06-20 06:45  dimitr 
+   M src/jrd/btr.cpp
+Fixed CORE-4127: Server crashes instead of reporting the error "key size exceeds implementation restriction".
+
  2013-06-19 11:46  hvlad 
    M src/jrd/tra.cpp
    M src/jrd/tra.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-20 16:26:27 UTC (rev 58223)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-21 00:28:38 UTC (rev 58224)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30462
+  FORMAL BUILD NUMBER:30468
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30462"
-#define FILE_VER_STRING "WI-T3.0.0.30462"
-#define LICENSE_VER_STRING "WI-T3.0.0.30462"
-#define FILE_VER_NUMBER 3, 0, 0, 30462
+#define PRODUCT_VER_STRING "3.0.0.30468"
+#define FILE_VER_STRING "WI-T3.0.0.30468"
+#define LICENSE_VER_STRING "WI-T3.0.0.30468"
+#define FILE_VER_NUMBER 3, 0, 0, 30468
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30462"
+#define FB_BUILD_NO "30468"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-20 16:26:27 UTC (rev 58223)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-21 00:28:38 UTC (rev 58224)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30462
+BuildNum=30468
 
 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...> - 2013-06-22 00:34:00
       | 
| Revision: 58230
          http://sourceforge.net/p/firebird/code/58230
Author:   firebirds
Date:     2013-06-22 00:33:57 +0000 (Sat, 22 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-21 16:19:49 UTC (rev 58229)
+++ firebird/trunk/ChangeLog	2013-06-22 00:33:57 UTC (rev 58230)
@@ -1,3 +1,15 @@
+ 2013-06-21 16:19  alexpeshkoff 
+   M doc/README.plugins.html
+Avoid bad style - thanks to Mark
+
+ 2013-06-21 16:17  alexpeshkoff 
+   M builds/install/misc/firebird.conf.in
+Fixed parameter description - thanks to Mark
+
+ 2013-06-21 09:47  mapopa 
+   M src/extlib/fbudf/fbudf.cpp
+place parentheses around the '&&' expression to silence the warning
+
  2013-06-20 16:26  dimitr 
    M src/common/TextType.cpp
 Front ported the error code validation.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-21 16:19:49 UTC (rev 58229)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-22 00:33:57 UTC (rev 58230)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30468
+  FORMAL BUILD NUMBER:30471
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30468"
-#define FILE_VER_STRING "WI-T3.0.0.30468"
-#define LICENSE_VER_STRING "WI-T3.0.0.30468"
-#define FILE_VER_NUMBER 3, 0, 0, 30468
+#define PRODUCT_VER_STRING "3.0.0.30471"
+#define FILE_VER_STRING "WI-T3.0.0.30471"
+#define LICENSE_VER_STRING "WI-T3.0.0.30471"
+#define FILE_VER_NUMBER 3, 0, 0, 30471
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30468"
+#define FB_BUILD_NO "30471"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-21 16:19:49 UTC (rev 58229)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-22 00:33:57 UTC (rev 58230)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30468
+BuildNum=30471
 
 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...> - 2013-06-24 00:31:02
       | 
| Revision: 58233
          http://sourceforge.net/p/firebird/code/58233
Author:   firebirds
Date:     2013-06-24 00:31:00 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-23 18:22:03 UTC (rev 58232)
+++ firebird/trunk/ChangeLog	2013-06-24 00:31:00 UTC (rev 58233)
@@ -1,3 +1,7 @@
+ 2013-06-23 18:22  asfernandes 
+   M src/dsql/PackageNodes.epp
+Fixed CORE-4126 - gbak -r fails in restoring all stored procedures/functions in packages.
+
  2013-06-21 16:19  alexpeshkoff 
    M doc/README.plugins.html
 Avoid bad style - thanks to Mark
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-23 18:22:03 UTC (rev 58232)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-24 00:31:00 UTC (rev 58233)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30471
+  FORMAL BUILD NUMBER:30472
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30471"
-#define FILE_VER_STRING "WI-T3.0.0.30471"
-#define LICENSE_VER_STRING "WI-T3.0.0.30471"
-#define FILE_VER_NUMBER 3, 0, 0, 30471
+#define PRODUCT_VER_STRING "3.0.0.30472"
+#define FILE_VER_STRING "WI-T3.0.0.30472"
+#define LICENSE_VER_STRING "WI-T3.0.0.30472"
+#define FILE_VER_NUMBER 3, 0, 0, 30472
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30471"
+#define FB_BUILD_NO "30472"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-23 18:22:03 UTC (rev 58232)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-24 00:31:00 UTC (rev 58233)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30471
+BuildNum=30472
 
 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...> - 2013-06-26 08:04:54
       | 
| Revision: 58258
          http://sourceforge.net/p/firebird/code/58258
Author:   firebirds
Date:     2013-06-26 08:04:51 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-26 07:18:25 UTC (rev 58257)
+++ firebird/trunk/ChangeLog	2013-06-26 08:04:51 UTC (rev 58258)
@@ -1,3 +1,76 @@
+ 2013-06-26 07:17  alexpeshkoff 
+   M examples/interfaces/04.print_table.cpp
+no more need in plan here
+
+ 2013-06-26 06:57  dimitr 
+   M src/isql/isql.epp
+   M src/isql/isql.h
+Added support for the explained plan.
+
+ 2013-06-26 06:49  dimitr 
+   M src/isql/isql.epp
+Added support for the explained plan.
+
+ 2013-06-26 06:21  dimitr 
+   M src/isql/show.epp
+Fixed CORE-3963: isql doesn't know the difference between UDF's and psql-functions.
+
+ 2013-06-26 02:14  asfernandes 
+   M src/common/unicode_util.cpp
+Rework on CORE-4125 to work with ICU 3.0.
+
+ 2013-06-25 17:46  dimitr 
+   M src/jrd/opt.cpp
+Fixed the issue reported by Alex privately.
+
+ 2013-06-25 13:37  alexpeshkoff 
+   A examples/interfaces/01.create.cpp (from /firebird/trunk/examples/interfaces/create.cpp:58242)
+   A examples/interfaces/02.update.cpp (from /firebird/trunk/examples/interfaces/update.cpp:58244)
+   A examples/interfaces/03.select.cpp (from /firebird/trunk/examples/interfaces/select.cpp:58243)
+   A examples/interfaces/04.print_table.cpp
+   D examples/interfaces/create.cpp
+   D examples/interfaces/select.cpp
+   D examples/interfaces/update.cpp
+Examples reworked, added, commented better
+
+ 2013-06-25 08:58  dimitr 
+   M src/isql/extract.epp
+Fixed CORE-4122: Metadata export with isql (option -ex) does not export functions properly.
+
+ 2013-06-25 02:36  asfernandes 
+   M src/common/unicode_util.cpp
+Fixed CORE-4125 - Using COLLATE UNICODE_CI_AI in WHERE clause (not indexed) is extremely slow.
+
+ 2013-06-24 13:40  alexpeshkoff 
+   A examples/interfaces/update.cpp
+A sample of running prepared update statement multiple times. Based on old sample api3 with appropriate license.
+
+ 2013-06-24 12:36  alexpeshkoff 
+   M examples/interfaces/select.cpp
+Make sample buildable after API changes. Make it look a bit like old sample api3.
+
+ 2013-06-24 12:26  alexpeshkoff 
+   A examples/interfaces/create.cpp
+Example on how to create database and table
+
+ 2013-06-24 12:24  alexpeshkoff 
+   M src/jrd/jrd.cpp
+   M src/yvalve/why.cpp
+Make dialect 3 default when creating database using OO API. Keep legacy behavior in ISC API.
+
+ 2013-06-24 08:39  alexpeshkoff 
+   M src/auth/SecureRemotePassword/client/SrpClient.cpp
+   M src/auth/SecureRemotePassword/server/SrpServer.cpp
+   M src/remote/client/interface.cpp
+   M src/remote/remote.cpp
+   M src/remote/remote.h
+   M src/remote/server/server.cpp
+Authentication handshake improvements and fixes. Make debug output better readable.
+
+ 2013-06-24 08:36  alexpeshkoff 
+   M src/utilities/fbsvcmgr/fbsvcmgr.cpp
+Avoid adding incompatible info item to pure info requests
+
  2013-06-23 18:22  asfernandes 
    M src/dsql/PackageNodes.epp
 Fixed CORE-4126 - gbak -r fails in restoring all stored procedures/functions in packages.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-26 07:18:25 UTC (rev 58257)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-26 08:04:51 UTC (rev 58258)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30472
+  FORMAL BUILD NUMBER:30487
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30472"
-#define FILE_VER_STRING "WI-T3.0.0.30472"
-#define LICENSE_VER_STRING "WI-T3.0.0.30472"
-#define FILE_VER_NUMBER 3, 0, 0, 30472
+#define PRODUCT_VER_STRING "3.0.0.30487"
+#define FILE_VER_STRING "WI-T3.0.0.30487"
+#define LICENSE_VER_STRING "WI-T3.0.0.30487"
+#define FILE_VER_NUMBER 3, 0, 0, 30487
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30472"
+#define FB_BUILD_NO "30487"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-26 07:18:25 UTC (rev 58257)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-26 08:04:51 UTC (rev 58258)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30472
+BuildNum=30487
 
 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...> - 2013-06-28 00:57:03
       | 
| Revision: 58262
          http://sourceforge.net/p/firebird/code/58262
Author:   firebirds
Date:     2013-06-28 00:57:00 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-27 18:35:58 UTC (rev 58261)
+++ firebird/trunk/ChangeLog	2013-06-28 00:57:00 UTC (rev 58262)
@@ -1,3 +1,8 @@
+ 2013-06-27 18:25  dimitr 
+   M src/msgs/facilities2.sql
+   M src/msgs/messages2.sql
+Committed the forgotten help text.
+
  2013-06-26 07:17  alexpeshkoff 
    M examples/interfaces/04.print_table.cpp
 no more need in plan here
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-27 18:35:58 UTC (rev 58261)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-28 00:57:00 UTC (rev 58262)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30487
+  FORMAL BUILD NUMBER:30488
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30487"
-#define FILE_VER_STRING "WI-T3.0.0.30487"
-#define LICENSE_VER_STRING "WI-T3.0.0.30487"
-#define FILE_VER_NUMBER 3, 0, 0, 30487
+#define PRODUCT_VER_STRING "3.0.0.30488"
+#define FILE_VER_STRING "WI-T3.0.0.30488"
+#define LICENSE_VER_STRING "WI-T3.0.0.30488"
+#define FILE_VER_NUMBER 3, 0, 0, 30488
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30487"
+#define FB_BUILD_NO "30488"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-27 18:35:58 UTC (rev 58261)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-28 00:57:00 UTC (rev 58262)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30487
+BuildNum=30488
 
 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...> - 2013-06-28 02:03:15
       | 
| Revision: 58264
          http://sourceforge.net/p/firebird/code/58264
Author:   asfernandes
Date:     2013-06-28 02:03:10 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
Misc.
Modified Paths:
--------------
    firebird/trunk/examples/interfaces/01.create.cpp
    firebird/trunk/examples/interfaces/02.update.cpp
    firebird/trunk/examples/interfaces/03.select.cpp
    firebird/trunk/examples/interfaces/04.print_table.cpp
    firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp
    firebird/trunk/src/extlib/fbudf/fbudf.cpp
    firebird/trunk/src/isql/extract.epp
    firebird/trunk/src/isql/show.epp
    firebird/trunk/src/msgs/facilities2.sql
    firebird/trunk/src/remote/client/interface.cpp
    firebird/trunk/src/remote/server/server.cpp
Modified: firebird/trunk/examples/interfaces/01.create.cpp
===================================================================
--- firebird/trunk/examples/interfaces/01.create.cpp	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/examples/interfaces/01.create.cpp	2013-06-28 02:03:10 UTC (rev 58264)
@@ -135,7 +135,7 @@
 		check(st, "detach");
 		att = NULL;
 	}
-	catch(const char* text)
+	catch (const char* text)
 	{
 		// handle error
 		rc = 1;
Modified: firebird/trunk/examples/interfaces/02.update.cpp
===================================================================
--- firebird/trunk/examples/interfaces/02.update.cpp	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/examples/interfaces/02.update.cpp	2013-06-28 02:03:10 UTC (rev 58264)
@@ -46,8 +46,8 @@
 
 static IMaster* master = fb_get_master_interface();
 
-int get_input (char* , double*);
-static const char *Dept_data[] =
+int get_input(char*, double*);
+static const char* Dept_data[] =
      {"622", "100", "116", "900", 0};
 static double Percent_data[] =
     {0.05,  1.00,  0.075,  0.10, 0};
@@ -82,7 +82,7 @@
 	// Interface makes it possible to change format of data or define it yourself
 	IMetadataBuilder* builder = NULL;
 
-	const char *updstr =
+	const char* updstr =
 	    "UPDATE department SET budget = ? * budget + budget WHERE dept_no = ?";
 
 	try
@@ -133,14 +133,14 @@
 		// locations of parameters in input message
 		char* dept_no = &buffer[meta->getOffset(st, 1)];
 		check(st, "getOffset");
- 		double* percent_inc = (double*)&buffer[meta->getOffset(st, 0)];
+ 		double* percent_inc = (double*) &buffer[meta->getOffset(st, 0)];
 		check(st, "getOffset");
 
 		// null IDs (set to NOT NULL)
  		short* flag = (short*)&buffer[meta->getNullOffset(st, 0)];
 		check(st, "getNullOffset");
  		*flag = 0;
- 		flag = (short*)&buffer[meta->getNullOffset(st, 1)];
+ 		flag = (short*) &buffer[meta->getNullOffset(st, 1)];
 		check(st, "getNullOffset");
  		*flag = 0;
 
@@ -192,7 +192,7 @@
 		check(st, "detach");
 		att = NULL;
 	}
-	catch(const char* text)
+	catch (const char* text)
 	{
 		// handle error
 		rc = 1;
Modified: firebird/trunk/examples/interfaces/03.select.cpp
===================================================================
--- firebird/trunk/examples/interfaces/03.select.cpp	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/examples/interfaces/03.select.cpp	2013-06-28 02:03:10 UTC (rev 58264)
@@ -190,7 +190,7 @@
 		check(st, "detach");
 		att = NULL;
 	}
-	catch(const char* text)
+	catch (const char* text)
 	{
 		// handle error
 		rc = 1;
Modified: firebird/trunk/examples/interfaces/04.print_table.cpp
===================================================================
--- firebird/trunk/examples/interfaces/04.print_table.cpp	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/examples/interfaces/04.print_table.cpp	2013-06-28 02:03:10 UTC (rev 58264)
@@ -60,6 +60,7 @@
 int main()
 {
 	int rc = 0;
+	char s[100];
 
 	setenv("ISC_USER", "sysdba", 0);
 	setenv("ISC_PASSWORD", "masterkey", 0);
@@ -112,7 +113,7 @@
 			unsigned sub = meta->getSubType(st, j);
 			check(st, "getSubType");
 
-			switch(t)
+			switch (t)
 			{
 			case SQL_BLOB:
 				if (sub != 1)
@@ -127,7 +128,6 @@
 
 			default:
 				{
-					char s[100];
 					sprintf(s, "Unknown type %d for %s", t, meta->getField(st, j));
 					throw s;
 				}
@@ -183,7 +183,7 @@
 		check(st, "detach");
 		att = NULL;
 	}
-	catch(const char* text)
+	catch (const char* text)
 	{
 		rc = 1;
 
@@ -229,7 +229,7 @@
 
 	// IBlob makes it possible to read/write BLOB data
 	IBlob* blob = NULL;
-	switch(type)
+	switch (type)
 	{
 	// text fields
 	case SQL_TEXT:
@@ -257,7 +257,7 @@
 		try
 		{
 			// use attachment's method to access BLOB object
-			blob = att->openBlob(st, tra, (ISC_QUAD*)(buf + offset));
+			blob = att->openBlob(st, tra, (ISC_QUAD*) (buf + offset));
 			check(st, "openBlob");
 
 			char segbuf[16];
@@ -279,7 +279,7 @@
 			blob = NULL;
 			printf("\n");
 		}
-		catch(...)
+		catch (...)
 		{
 			if (blob)
 				blob->release();
Modified: firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp	2013-06-28 02:03:10 UTC (rev 58264)
@@ -64,7 +64,8 @@
 
 		if (!client)
 		{
-			HANDSHAKE_DEBUG(fprintf(stderr, "Cli: SRP phase1: login=%s password=%s\n", cb->getLogin(), cb->getPassword()));
+			HANDSHAKE_DEBUG(fprintf(stderr, "Cli: SRP phase1: login=%s password=%s\n",
+				cb->getLogin(), cb->getPassword()));
 			if (!(cb->getLogin() && cb->getPassword()))
 			{
 				return AUTH_CONTINUE;
Modified: firebird/trunk/src/extlib/fbudf/fbudf.cpp
===================================================================
--- firebird/trunk/src/extlib/fbudf/fbudf.cpp	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/src/extlib/fbudf/fbudf.cpp	2013-06-28 02:03:10 UTC (rev 58264)
@@ -507,7 +507,7 @@
 	}
 	const int ly = times.tm_year + 1900;
 	const bool leap = (ly % 4 == 0 && ly % 100 != 0) || ly % 400 == 0;
-	const int md[] = {31, leap ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+	const int md[] = {31, (leap ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
 	if (times.tm_mday > md[times.tm_mon])
 		times.tm_mday = md[times.tm_mon];
 	internal::encode_timestamp(×, v);
Modified: firebird/trunk/src/isql/extract.epp
===================================================================
--- firebird/trunk/src/isql/extract.epp	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/src/isql/extract.epp	2013-06-28 02:03:10 UTC (rev 58264)
@@ -3174,7 +3174,7 @@
 		}
 		else
 			isqlGlob.printf("%sALTER FUNCTION %s ", NEWLINE, FUN.RDB$FUNCTION_NAME);
-		
+
 		get_function_args_ods12(FUN.RDB$FUNCTION_NAME, FUN.RDB$RETURN_ARGUMENT);
 
 		// Print the function body
Modified: firebird/trunk/src/isql/show.epp
===================================================================
--- firebird/trunk/src/isql/show.epp	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/src/isql/show.epp	2013-06-28 02:03:10 UTC (rev 58264)
@@ -3356,7 +3356,7 @@
 
 				}
 
-				if (i == 0 && private_flag || i == 1 && !private_flag)
+				if ((i == 0 && private_flag) || (i == 1 && !private_flag))
 					continue;
 
 				// Strip trailing blanks
@@ -3377,7 +3377,7 @@
 					}
 					first_dep = false;
 					isqlGlob.printf("%s, %s", DEP.RDB$DEPENDED_ON_NAME,
-							 Object_types[DEP.RDB$DEPENDED_ON_TYPE]);
+						Object_types[DEP.RDB$DEPENDED_ON_TYPE]);
 				END_FOR
 				ON_ERROR
 					ISQL_errmsg (isc_status);
@@ -3457,7 +3457,7 @@
 			fb_utils::exact_name(ARG.RDB$ARGUMENT_NAME);
 
 			isqlGlob.printf("%-33s %s ", ARG.RDB$ARGUMENT_NAME,
-					 (ARG.RDB$ARGUMENT_POSITION == FUN.RDB$RETURN_ARGUMENT ? "OUTPUT" : "INPUT"));
+				(ARG.RDB$ARGUMENT_POSITION == FUN.RDB$RETURN_ARGUMENT ? "OUTPUT" : "INPUT"));
 
 			prm_mech_t mechanism = prm_mech_normal;
 			bool prm_default_source_null = true;
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/src/msgs/facilities2.sql	2013-06-28 02:03:10 UTC (rev 58264)
@@ -13,7 +13,7 @@
 ('2012-02-18 20:00:00', 'SQLERR', 13, 1033)
 ('1996-11-07 13:38:42', 'SQLWARN', 14, 613)
 ('2006-09-10 03:04:31', 'JRD_BUGCHK', 15, 307)
-('2009-12-21 04:00:05', 'ISQL', 17, 174)
+('2013-06-27 23:00:00', 'ISQL', 17, 174)
 ('2010-07-10 10:50:30', 'GSEC', 18, 105)
 ('2012-05-25 19:59:42', 'GSTAT', 21, 56)
 ('2009-12-18 19:33:34', 'FBSVCMGR', 22, 57)
Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/src/remote/client/interface.cpp	2013-06-28 02:03:10 UTC (rev 58264)
@@ -6180,7 +6180,8 @@
 			{
 			case Auth::AUTH_SUCCESS:
 			case Auth::AUTH_MORE_DATA:
-				HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authFillParametersBlock: plugin %s is OK\n", cBlock.plugins.name()));
+				HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authFillParametersBlock: plugin %s is OK\n",
+					cBlock.plugins.name()));
 				cleanDpb(dpb, tags);
 				cBlock.extractDataFromPluginTo(dpb, tags, port->port_protocol);
 				return;
@@ -6189,12 +6190,15 @@
 				continue;
 
 			case Auth::AUTH_FAILED:
-				HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authFillParametersBlock: plugin %s FAILED\n", cBlock.plugins.name()));
+				HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authFillParametersBlock: plugin %s FAILED\n",
+					cBlock.plugins.name()));
 				(Arg::Gds(isc_login) << Arg::StatusVector(s.get())).raise();
 				break;	// compiler silencer
 			}
 		}
-		HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authFillParametersBlock: try next plugin, %s skipped\n", cBlock.plugins.name()));
+
+		HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authFillParametersBlock: try next plugin, %s skipped\n",
+			cBlock.plugins.name()));
 	}
 }
 
@@ -6252,8 +6256,9 @@
 			d = &packet->p_auth_cont.p_data;
 			n = &packet->p_auth_cont.p_name;
 			port->addServerKeys(&packet->p_auth_cont.p_keys);
-			HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authReceiveResponse: ont_auth d=%d n=%d '%.*s' 0x%x\n", d->cstr_length, n->cstr_length,
-									n->cstr_length, n->cstr_address, n->cstr_address ? n->cstr_address[0] : 0));
+			HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authReceiveResponse: ont_auth d=%d n=%d '%.*s' 0x%x\n",
+				d->cstr_length, n->cstr_length,
+				n->cstr_length, n->cstr_address, n->cstr_address ? n->cstr_address[0] : 0));
 			break;
 
 		case op_crypt:
@@ -7505,13 +7510,15 @@
 			}
 			dpb.insertPath(tags->plugin_list, pluginList);
 			firstTime = false;
-			HANDSHAKE_DEBUG(fprintf(stderr, "Cli: extractDataFromPluginTo: first time - added plugName & pluginList\n"));
+			HANDSHAKE_DEBUG(fprintf(stderr,
+				"Cli: extractDataFromPluginTo: first time - added plugName & pluginList\n"));
 		}
 		fb_assert(tags->specific_data);
 		dpb.insertBytes(tags->specific_data, dataFromPlugin.begin(), dataFromPlugin.getCount());
 
-		HANDSHAKE_DEBUG(fprintf(stderr, "Cli: extractDataFromPluginTo: Added %" SIZEFORMAT " bytes of spec data with tag %d\n",
-								dataFromPlugin.getCount(), tags->specific_data));
+		HANDSHAKE_DEBUG(fprintf(stderr,
+			"Cli: extractDataFromPluginTo: Added %" SIZEFORMAT " bytes of spec data with tag %d\n",
+			dataFromPlugin.getCount(), tags->specific_data));
 
 		return;
 	}
@@ -7556,12 +7563,14 @@
 			makeUtfString(uft8Convert, password);
 			dpb.getString(password);
 			dpb.deleteClumplet();
-			HANDSHAKE_DEBUG(fprintf(stderr, "Cli: loadClnt: Loaded from PB password = %s\n", password.c_str()));
+			HANDSHAKE_DEBUG(fprintf(stderr,
+				"Cli: loadClnt: Loaded from PB password = %s\n", password.c_str()));
 		}
 		else if (t == tags->encrypt_key)
 		{
 			hasCryptKey = true;
-			HANDSHAKE_DEBUG(fprintf(stderr, "Cli: loadClnt: PB contains crypt key - need encrypted line to pass\n"));
+			HANDSHAKE_DEBUG(fprintf(stderr,
+				"Cli: loadClnt: PB contains crypt key - need encrypted line to pass\n"));
 		}
 	}
 }
@@ -7591,8 +7600,9 @@
 		to->p_list.cstr_length = (ULONG) pluginList.length();
 		to->p_list.cstr_address = (UCHAR*) pluginList.c_str();
 		to->p_list.cstr_allocated = 0;
-		HANDSHAKE_DEBUG(fprintf(stderr, "Cli: extractDataFromPluginTo: added plugin list (%d len) to packet\n",
-								to->p_list.cstr_length));
+		HANDSHAKE_DEBUG(fprintf(stderr,
+			"Cli: extractDataFromPluginTo: added plugin list (%d len) to packet\n",
+			to->p_list.cstr_length));
 		firstTime = false;
 	}
 	else
Modified: firebird/trunk/src/remote/server/server.cpp
===================================================================
--- firebird/trunk/src/remote/server/server.cpp	2013-06-28 01:16:38 UTC (rev 58263)
+++ firebird/trunk/src/remote/server/server.cpp	2013-06-28 02:03:10 UTC (rev 58264)
@@ -376,8 +376,9 @@
 
 			// if we asked for more data but received nothing switch to next plugin
 			bool forceNext = contAuth && (!authPort->port_srv_auth_block->hasDataForPlugin());
-			HANDSHAKE_DEBUG(fprintf(stderr, "Srv: authenticate: ServerAuth calls plug %s\n", forceNext ? "forced-NEXT" : authItr->name()));
-			int authResult = forceNext ? Auth::AUTH_CONTINUE : 
+			HANDSHAKE_DEBUG(fprintf(stderr, "Srv: authenticate: ServerAuth calls plug %s\n",
+				forceNext ? "forced-NEXT" : authItr->name()));
+			int authResult = forceNext ? Auth::AUTH_CONTINUE :
 				authServer->authenticate(&st, authPort->port_srv_auth_block,
 					&authPort->port_srv_auth_block->authBlockWriter);
 			authPort->port_srv_auth_block->setPluginName(authItr->name());
@@ -1567,14 +1568,16 @@
 		Firebird::ClumpletReader id(Firebird::ClumpletReader::UnTagged,
 									connect->p_cnct_user_id.cstr_address,
 									connect->p_cnct_user_id.cstr_length);
-		HANDSHAKE_DEBUG(fprintf(stderr, "Srv: accept_connection: is going to load data to port_srv_auth_block\n"));
+		HANDSHAKE_DEBUG(fprintf(stderr,
+			"Srv: accept_connection: is going to load data to port_srv_auth_block\n"));
 		port->port_srv_auth_block->load(id);
 		if (port->port_srv_auth_block->getLogin())
 		{
 			port->port_login = port->port_srv_auth_block->getLogin();
 		}
 
-		HANDSHAKE_DEBUG(fprintf(stderr, "Srv: accept_connection: finished with port_srv_auth_block prepare, a=%d\n", accepted));
+		HANDSHAKE_DEBUG(fprintf(stderr,
+			"Srv: accept_connection: finished with port_srv_auth_block prepare, a=%d\n", accepted));
 
 		if (port->port_srv_auth_block->getPluginName())
 		{
@@ -1585,7 +1588,8 @@
 
 			if (port->port_srv_auth_block->plugins)		// We have all required data and iterator was created
 			{
-				HANDSHAKE_DEBUG(fprintf(stderr, "Srv: accept_connection: call plugin %s\n", port->port_srv_auth_block->getPluginName()));
+				HANDSHAKE_DEBUG(fprintf(stderr,
+					"Srv: accept_connection: call plugin %s\n", port->port_srv_auth_block->getPluginName()));
 
 				AuthServerPlugins* const plugins = port->port_srv_auth_block->plugins;
 				for (; plugins->hasData(); plugins->next())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2013-06-29 00:39:00
       | 
| Revision: 58266
          http://sourceforge.net/p/firebird/code/58266
Author:   firebirds
Date:     2013-06-29 00:38:57 +0000 (Sat, 29 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-28 15:55:02 UTC (rev 58265)
+++ firebird/trunk/ChangeLog	2013-06-29 00:38:57 UTC (rev 58266)
@@ -1,3 +1,21 @@
+ 2013-06-28 15:55  asfernandes 
+   M src/jrd/recsrc/AggregatedStream.cpp
+Fixed CORE-4131 - Error when processing an empty data set by window function, if reading indexed.
+
+ 2013-06-28 02:03  asfernandes 
+   M examples/interfaces/01.create.cpp
+   M examples/interfaces/02.update.cpp
+   M examples/interfaces/03.select.cpp
+   M examples/interfaces/04.print_table.cpp
+   M src/auth/SecureRemotePassword/client/SrpClient.cpp
+   M src/extlib/fbudf/fbudf.cpp
+   M src/isql/extract.epp
+   M src/isql/show.epp
+   M src/msgs/facilities2.sql
+   M src/remote/client/interface.cpp
+   M src/remote/server/server.cpp
+Misc.
+
  2013-06-27 18:25  dimitr 
    M src/msgs/facilities2.sql
    M src/msgs/messages2.sql
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-28 15:55:02 UTC (rev 58265)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-29 00:38:57 UTC (rev 58266)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30488
+  FORMAL BUILD NUMBER:30490
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30488"
-#define FILE_VER_STRING "WI-T3.0.0.30488"
-#define LICENSE_VER_STRING "WI-T3.0.0.30488"
-#define FILE_VER_NUMBER 3, 0, 0, 30488
+#define PRODUCT_VER_STRING "3.0.0.30490"
+#define FILE_VER_STRING "WI-T3.0.0.30490"
+#define LICENSE_VER_STRING "WI-T3.0.0.30490"
+#define FILE_VER_NUMBER 3, 0, 0, 30490
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30488"
+#define FB_BUILD_NO "30490"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-28 15:55:02 UTC (rev 58265)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-29 00:38:57 UTC (rev 58266)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30488
+BuildNum=30490
 
 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...> - 2013-06-30 00:28:50
       | 
| Revision: 58273
          http://sourceforge.net/p/firebird/code/58273
Author:   firebirds
Date:     2013-06-30 00:28:47 +0000 (Sun, 30 Jun 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-29 13:47:00 UTC (rev 58272)
+++ firebird/trunk/ChangeLog	2013-06-30 00:28:47 UTC (rev 58273)
@@ -1,3 +1,15 @@
+ 2013-06-29 11:32  hvlad 
+   M src/jrd/Database.cpp
+   M src/jrd/Database.h
+   M src/jrd/jrd.cpp
+   M src/jrd/tra.cpp
+Fixed bug CORE-4134 : Race condition when auto-sweep is started
+
+ 2013-06-29 11:25  hvlad 
+   M src/jrd/jrd.cpp
+Fixed bug CORE-4135 : In SS sweep blocks establishment of concurrent attachments.
+More details in tracker.
+
  2013-06-28 15:55  asfernandes 
    M src/jrd/recsrc/AggregatedStream.cpp
 Fixed CORE-4131 - Error when processing an empty data set by window function, if reading indexed.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-29 13:47:00 UTC (rev 58272)
+++ firebird/trunk/src/jrd/build_no.h	2013-06-30 00:28:47 UTC (rev 58273)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30490
+  FORMAL BUILD NUMBER:30492
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30490"
-#define FILE_VER_STRING "WI-T3.0.0.30490"
-#define LICENSE_VER_STRING "WI-T3.0.0.30490"
-#define FILE_VER_NUMBER 3, 0, 0, 30490
+#define PRODUCT_VER_STRING "3.0.0.30492"
+#define FILE_VER_STRING "WI-T3.0.0.30492"
+#define LICENSE_VER_STRING "WI-T3.0.0.30492"
+#define FILE_VER_NUMBER 3, 0, 0, 30492
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30490"
+#define FB_BUILD_NO "30492"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-29 13:47:00 UTC (rev 58272)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-06-30 00:28:47 UTC (rev 58273)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30490
+BuildNum=30492
 
 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...> - 2013-07-01 00:39:53
       | 
| Revision: 58282
          http://sourceforge.net/p/firebird/code/58282
Author:   firebirds
Date:     2013-07-01 00:39:51 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-06-30 19:21:02 UTC (rev 58281)
+++ firebird/trunk/ChangeLog	2013-07-01 00:39:51 UTC (rev 58282)
@@ -1,3 +1,30 @@
+ 2013-06-30 19:21  dimitr 
+   M src/auth/SecureRemotePassword/server/SrpServer.cpp
+Misc.
+
+ 2013-06-30 19:05  dimitr 
+   M src/remote/client/interface.cpp
+Fixed CORE-4132: gbak requires exclusive access.
+
+ 2013-06-30 17:33  dimitr 
+   M src/jrd/Optimizer.cpp
+   M src/jrd/Optimizer.h
+   M src/jrd/opt.cpp
+Slightly refactored the optimizer regarding navigational walks.
+
+ 2013-06-30 15:20  hvlad 
+   M src/jrd/shut.cpp
+Prevent starting a lot of threads when forced shutdown is in progress.
+
+ 2013-06-30 14:02  hvlad 
+   M src/jrd/cch.cpp
+Fixed my bug introduced when porting page cache on fb3
+
+ 2013-06-30 02:15  asfernandes 
+   M src/jrd/recsrc/AggregatedStream.cpp
+   M src/jrd/recsrc/RecordSource.h
+Refactor AggregatedStream to remove duplicated code and make it easier to understand.
+
  2013-06-29 11:32  hvlad 
    M src/jrd/Database.cpp
    M src/jrd/Database.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-06-30 19:21:02 UTC (rev 58281)
+++ firebird/trunk/src/jrd/build_no.h	2013-07-01 00:39:51 UTC (rev 58282)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30492
+  FORMAL BUILD NUMBER:30498
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30492"
-#define FILE_VER_STRING "WI-T3.0.0.30492"
-#define LICENSE_VER_STRING "WI-T3.0.0.30492"
-#define FILE_VER_NUMBER 3, 0, 0, 30492
+#define PRODUCT_VER_STRING "3.0.0.30498"
+#define FILE_VER_STRING "WI-T3.0.0.30498"
+#define LICENSE_VER_STRING "WI-T3.0.0.30498"
+#define FILE_VER_NUMBER 3, 0, 0, 30498
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30492"
+#define FB_BUILD_NO "30498"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-06-30 19:21:02 UTC (rev 58281)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-07-01 00:39:51 UTC (rev 58282)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30492
+BuildNum=30498
 
 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...> - 2013-07-03 01:35:49
       | 
| Revision: 58285
          http://sourceforge.net/p/firebird/code/58285
Author:   firebirds
Date:     2013-07-03 01:35:46 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-07-02 11:27:02 UTC (rev 58284)
+++ firebird/trunk/ChangeLog	2013-07-03 01:35:46 UTC (rev 58285)
@@ -1,3 +1,7 @@
+ 2013-07-02 11:27  dimitr 
+   M src/jrd/vio.cpp
+Misc.
+
  2013-06-30 19:21  dimitr 
    M src/auth/SecureRemotePassword/server/SrpServer.cpp
 Misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-07-02 11:27:02 UTC (rev 58284)
+++ firebird/trunk/src/jrd/build_no.h	2013-07-03 01:35:46 UTC (rev 58285)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30498
+  FORMAL BUILD NUMBER:30499
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30498"
-#define FILE_VER_STRING "WI-T3.0.0.30498"
-#define LICENSE_VER_STRING "WI-T3.0.0.30498"
-#define FILE_VER_NUMBER 3, 0, 0, 30498
+#define PRODUCT_VER_STRING "3.0.0.30499"
+#define FILE_VER_STRING "WI-T3.0.0.30499"
+#define LICENSE_VER_STRING "WI-T3.0.0.30499"
+#define FILE_VER_NUMBER 3, 0, 0, 30499
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30498"
+#define FB_BUILD_NO "30499"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-07-02 11:27:02 UTC (rev 58284)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-07-03 01:35:46 UTC (rev 58285)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30498
+BuildNum=30499
 
 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...> - 2013-07-04 00:53:18
       | 
| Revision: 58305
          http://sourceforge.net/p/firebird/code/58305
Author:   firebirds
Date:     2013-07-04 00:53:15 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-07-03 15:24:34 UTC (rev 58304)
+++ firebird/trunk/ChangeLog	2013-07-04 00:53:15 UTC (rev 58305)
@@ -1,3 +1,21 @@
+ 2013-07-03 15:24  asfernandes 
+   M src/isql/show.epp
+Warning.
+
+ 2013-07-03 13:22  dimitr 
+   M src/jrd/Database.h
+   M src/jrd/jrd.cpp
+   M src/jrd/jrd.h
+Better protection against AST delivery during detaching.
+
+ 2013-07-03 11:33  dimitr 
+   M src/jrd/cch.cpp
+Misc.
+
+ 2013-07-03 02:13  asfernandes 
+   M src/isql/isql.epp
+Fixed CORE-4137 - Wrong metadata output script generate by isql / CHARACTER SETISO8859_1 sintaxe error.
+
  2013-07-02 11:27  dimitr 
    M src/jrd/vio.cpp
 Misc.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-07-03 15:24:34 UTC (rev 58304)
+++ firebird/trunk/src/jrd/build_no.h	2013-07-04 00:53:15 UTC (rev 58305)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30499
+  FORMAL BUILD NUMBER:30503
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30499"
-#define FILE_VER_STRING "WI-T3.0.0.30499"
-#define LICENSE_VER_STRING "WI-T3.0.0.30499"
-#define FILE_VER_NUMBER 3, 0, 0, 30499
+#define PRODUCT_VER_STRING "3.0.0.30503"
+#define FILE_VER_STRING "WI-T3.0.0.30503"
+#define LICENSE_VER_STRING "WI-T3.0.0.30503"
+#define FILE_VER_NUMBER 3, 0, 0, 30503
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30499"
+#define FB_BUILD_NO "30503"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-07-03 15:24:34 UTC (rev 58304)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-07-04 00:53:15 UTC (rev 58305)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30499
+BuildNum=30503
 
 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...> - 2013-07-06 01:01:18
       | 
| Revision: 58316
          http://sourceforge.net/p/firebird/code/58316
Author:   firebirds
Date:     2013-07-06 01:01:14 +0000 (Sat, 06 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-07-05 09:40:26 UTC (rev 58315)
+++ firebird/trunk/ChangeLog	2013-07-06 01:01:14 UTC (rev 58316)
@@ -1,3 +1,29 @@
+ 2013-07-05 09:40  paul_reeves 
+   M builds/install/arch-specific/win32/After_Installation.url
+   M builds/install/arch-specific/win32/BuildExecutableInstall.bat
+   M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
+   M builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc
+   M builds/install/arch-specific/win32/FirebirdInstall_30.iss
+   M builds/install/arch-specific/win32/Readme.txt
+   M builds/install/arch-specific/win32/custom_messages.inc
+   M builds/install/arch-specific/win32/installation_readme.txt
+   M builds/install/arch-specific/win32/installation_scripted.txt
+push changes made to windows installer for Alpha1 tag to TRUNK
+
+ 2013-07-05 09:39  paul_reeves 
+   M builds/install/misc/firebird.conf.in
+spelling
+
+ 2013-07-05 09:38  paul_reeves 
+   M src/utilities/fbcpl/ctrlpan.cpp
+   M src/utilities/fbcpl/ctrlpan.h
+Fix for CORE-4020
+Instantiate cpl applet methods with LPARAM instead of long.
+
+ 2013-07-05 02:09  asfernandes 
+   M src/dsql/ddl.cpp
+Fixed CORE-4140 - EXECUTE BLOCK's TYPE OF parameters with NONE charset may have be transformed to the connection charset.
+
  2013-07-03 15:24  asfernandes 
    M src/isql/show.epp
 Warning.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-07-05 09:40:26 UTC (rev 58315)
+++ firebird/trunk/src/jrd/build_no.h	2013-07-06 01:01:14 UTC (rev 58316)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30503
+  FORMAL BUILD NUMBER:30507
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30503"
-#define FILE_VER_STRING "WI-T3.0.0.30503"
-#define LICENSE_VER_STRING "WI-T3.0.0.30503"
-#define FILE_VER_NUMBER 3, 0, 0, 30503
+#define PRODUCT_VER_STRING "3.0.0.30507"
+#define FILE_VER_STRING "WI-T3.0.0.30507"
+#define LICENSE_VER_STRING "WI-T3.0.0.30507"
+#define FILE_VER_NUMBER 3, 0, 0, 30507
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30503"
+#define FB_BUILD_NO "30507"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-07-05 09:40:26 UTC (rev 58315)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-07-06 01:01:14 UTC (rev 58316)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30503
+BuildNum=30507
 
 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...> - 2013-07-06 23:11:16
       | 
| Revision: 58317
          http://sourceforge.net/p/firebird/code/58317
Author:   asfernandes
Date:     2013-07-06 23:11:13 +0000 (Sat, 06 Jul 2013)
Log Message:
-----------
Misc.
Modified Paths:
--------------
    firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss
    firebird/trunk/src/jrd/Database.cpp
    firebird/trunk/src/jrd/cch.cpp
    firebird/trunk/src/jrd/jrd.cpp
    firebird/trunk/src/jrd/opt.cpp
Modified: firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss	2013-07-06 01:01:14 UTC (rev 58316)
+++ firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss	2013-07-06 23:11:13 UTC (rev 58317)
@@ -874,7 +874,7 @@
   SvcParams := ServerType + SvcParams;
 
   if IsComponentSelected('ServerComponent') and IsTaskSelected('UseSuperServerTask\UseGuardianTask') then
-    SvcParams := ServerType + SvcParams +  ' -guardian ';
+    SvcParams := ServerType + SvcParams + ' -guardian ';
   
   InstanceName := ServiceName('We currently do not support or test for a different instance name');
 
@@ -1001,7 +1001,7 @@
 				ReplaceLine(GetAppPath+'\firebird.conf','AuthServer = ','AuthServer = Srp, Win_Sspi, Legacy_Auth','#');
       end;
 
-		end;	
+	end;	
 			
   end;
 end;
Modified: firebird/trunk/src/jrd/Database.cpp
===================================================================
--- firebird/trunk/src/jrd/Database.cpp	2013-07-06 01:01:14 UTC (rev 58316)
+++ firebird/trunk/src/jrd/Database.cpp	2013-07-06 23:11:13 UTC (rev 58317)
@@ -125,7 +125,7 @@
 		Database* dbb = static_cast<Database*>(ast_object);
 		AsyncContextHolder tdbb(dbb, FB_FUNCTION);
 
-		if (dbb->dbb_flags & DBB_sweep_starting && !(dbb->dbb_flags &  DBB_sweep_in_progress))
+		if ((dbb->dbb_flags & DBB_sweep_starting) && !(dbb->dbb_flags & DBB_sweep_in_progress))
 		{
 			dbb->dbb_flags &= ~DBB_sweep_starting;
 			LCK_release(tdbb, dbb->dbb_sweep_lock);
@@ -136,7 +136,7 @@
 
 	Lock* Database::createSweepLock(thread_db* tdbb)
 	{
-		if (!dbb_sweep_lock) 
+		if (!dbb_sweep_lock)
 		{
 			dbb_sweep_lock = FB_NEW_RPT(*dbb_permanent, 0) Lock(tdbb, 0, LCK_sweep);
 			dbb_sweep_lock->lck_ast = blocking_ast_sweep;
@@ -189,7 +189,7 @@
 		while (true)
 		{
 			AtomicCounter::counter_type old = dbb_flags;
-			if ((old & (DBB_sweep_in_progress)) || (dbb_ast_flags & DBB_shutdown))
+			if ((old & DBB_sweep_in_progress) || (dbb_ast_flags & DBB_shutdown))
 				return false;
 
 			if (dbb_flags.compareExchange(old, old | DBB_sweep_in_progress))
@@ -209,9 +209,7 @@
 			}
 		}
 		else
-		{
 			dbb_flags &= ~DBB_sweep_starting;
-		}
 
 		return true;
 	}
@@ -221,9 +219,9 @@
 		if (!(dbb_flags & (DBB_sweep_starting | DBB_sweep_in_progress)))
 			return;
 
-		if (dbb_sweep_lock) {
+		if (dbb_sweep_lock)
 			LCK_release(tdbb, dbb_sweep_lock);
-		}
+
 		dbb_flags &= ~(DBB_sweep_in_progress | DBB_sweep_starting);
 	}
 
Modified: firebird/trunk/src/jrd/cch.cpp
===================================================================
--- firebird/trunk/src/jrd/cch.cpp	2013-07-06 01:01:14 UTC (rev 58316)
+++ firebird/trunk/src/jrd/cch.cpp	2013-07-06 23:11:13 UTC (rev 58317)
@@ -2771,7 +2771,7 @@
 					}
 				}
 
-				// release lock before loosing control over bdb, it prevents 
+				// release lock before loosing control over bdb, it prevents
 				// concurrent operations on released lock
 				if (release_flag)
 				{
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp	2013-07-06 01:01:14 UTC (rev 58316)
+++ firebird/trunk/src/jrd/jrd.cpp	2013-07-06 23:11:13 UTC (rev 58317)
@@ -1622,22 +1622,19 @@
 			if (options.dpb_verify)
 			{
 				validateAccess(attachment);
-				if (!CCH_exclusive(tdbb, LCK_PW, WAIT_PERIOD, NULL)) {
+				if (!CCH_exclusive(tdbb, LCK_PW, WAIT_PERIOD, NULL))
 					ERR_post(Arg::Gds(isc_bad_dpb_content) << Arg::Gds(isc_cant_validate));
-				}
 
 				// Can't allow garbage collection during database validation.
 
 				VIO_fini(tdbb);
 
-				if (!VAL_validate(tdbb, options.dpb_verify)) {
+				if (!VAL_validate(tdbb, options.dpb_verify))
 					ERR_punt();
-				}
 			}
 
-			if (options.dpb_journal.hasData()) {
+			if (options.dpb_journal.hasData())
 				ERR_post(Arg::Gds(isc_bad_dpb_content) << Arg::Gds(isc_cant_start_journal));
-			}
 
 			if (options.dpb_wal_action)
 			{
@@ -1685,13 +1682,10 @@
 			if (options.dpb_set_page_buffers)
 			{
 				if (dbb->dbb_config->getSharedCache())
-				{
 					validateAccess(attachment);
-				}
+
 				if (attachment->locksmith())
-				{
 					PAG_set_page_buffers(tdbb, options.dpb_page_buffers);
-				}
 			}
 
 			if (options.dpb_set_db_readonly)
@@ -1727,9 +1721,8 @@
 
 			dbb->dbb_crypto_manager->startCryptThread(tdbb);
 
-			if (options.dpb_dbkey_scope) {
+			if (options.dpb_dbkey_scope)
 				attachment->att_dbkey_trans = TRA_start(tdbb, 0, 0);
-			}
 
 			if (!(attachment->att_flags & ATT_no_db_triggers))
 			{
@@ -1790,7 +1783,7 @@
 				if (traceManager->needs(TRACE_EVENT_ERROR))
 					traceManager->event_error(&conn, &traceStatus, "JProvider::attachDatabase");
 
-				if (traceManager->needs(TRACE_EVENT_DETACH)) 
+				if (traceManager->needs(TRACE_EVENT_DETACH))
 					traceManager->event_detach(&conn, false);
 			}
 			else
Modified: firebird/trunk/src/jrd/opt.cpp
===================================================================
--- firebird/trunk/src/jrd/opt.cpp	2013-07-06 01:01:14 UTC (rev 58316)
+++ firebird/trunk/src/jrd/opt.cpp	2013-07-06 23:11:13 UTC (rev 58317)
@@ -2295,7 +2295,7 @@
 		// Persistent table
 		OptimizerRetrieval optimizerRetrieval(*tdbb->getDefaultPool(), opt, stream,
 											  outer_flag, inner_flag,
-											  sort_ptr ? *sort_ptr : NULL);
+											  (sort_ptr ? *sort_ptr : NULL));
 		AutoPtr<InversionCandidate> candidate(optimizerRetrieval.getInversion());
 
 		if (candidate)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2013-07-08 00:56:49
       | 
| Revision: 58323
          http://sourceforge.net/p/firebird/code/58323
Author:   firebirds
Date:     2013-07-08 00:56:47 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-07-07 16:11:28 UTC (rev 58322)
+++ firebird/trunk/ChangeLog	2013-07-08 00:56:47 UTC (rev 58323)
@@ -1,3 +1,28 @@
+ 2013-07-07 16:11  dimitr 
+   M src/dsql/BoolNodes.cpp
+   M src/dsql/BoolNodes.h
+   M src/dsql/ExprNodes.cpp
+   M src/dsql/ExprNodes.h
+   M src/dsql/Nodes.h
+   M src/jrd/Optimizer.cpp
+Sync'ed with v2.5 and fixed wrong stream comparison checks.
+
+ 2013-07-07 07:50  dimitr 
+   M src/jrd/Optimizer.cpp
+Fixed the assertion, thanks to Adriano.
+
+ 2013-07-07 01:57  asfernandes 
+   M src/common/unicode_util.cpp
+Fixed CORE-4136 - Sharp-S character treated incorrectly in UNICODE_CI_AI collation.
+
+ 2013-07-06 23:11  asfernandes 
+   M builds/install/arch-specific/win32/FirebirdInstall_30.iss
+   M src/jrd/Database.cpp
+   M src/jrd/cch.cpp
+   M src/jrd/jrd.cpp
+   M src/jrd/opt.cpp
+Misc.
+
  2013-07-05 09:40  paul_reeves 
    M builds/install/arch-specific/win32/After_Installation.url
    M builds/install/arch-specific/win32/BuildExecutableInstall.bat
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-07-07 16:11:28 UTC (rev 58322)
+++ firebird/trunk/src/jrd/build_no.h	2013-07-08 00:56:47 UTC (rev 58323)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30507
+  FORMAL BUILD NUMBER:30511
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30507"
-#define FILE_VER_STRING "WI-T3.0.0.30507"
-#define LICENSE_VER_STRING "WI-T3.0.0.30507"
-#define FILE_VER_NUMBER 3, 0, 0, 30507
+#define PRODUCT_VER_STRING "3.0.0.30511"
+#define FILE_VER_STRING "WI-T3.0.0.30511"
+#define LICENSE_VER_STRING "WI-T3.0.0.30511"
+#define FILE_VER_NUMBER 3, 0, 0, 30511
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30507"
+#define FB_BUILD_NO "30511"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-07-07 16:11:28 UTC (rev 58322)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-07-08 00:56:47 UTC (rev 58323)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30507
+BuildNum=30511
 
 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...> - 2013-07-09 01:43:18
       | 
| Revision: 58329
          http://sourceforge.net/p/firebird/code/58329
Author:   firebirds
Date:     2013-07-09 01:43:15 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-07-08 14:30:57 UTC (rev 58328)
+++ firebird/trunk/ChangeLog	2013-07-09 01:43:15 UTC (rev 58329)
@@ -1,3 +1,7 @@
+ 2013-07-08 08:37  dimitr 
+   M src/jrd/SysFunction.cpp
+CORE-3704: Add new context variables to the SYSTEM namespace.
+
  2013-07-07 16:11  dimitr 
    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	2013-07-08 14:30:57 UTC (rev 58328)
+++ firebird/trunk/src/jrd/build_no.h	2013-07-09 01:43:15 UTC (rev 58329)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30511
+  FORMAL BUILD NUMBER:30512
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30511"
-#define FILE_VER_STRING "WI-T3.0.0.30511"
-#define LICENSE_VER_STRING "WI-T3.0.0.30511"
-#define FILE_VER_NUMBER 3, 0, 0, 30511
+#define PRODUCT_VER_STRING "3.0.0.30512"
+#define FILE_VER_STRING "WI-T3.0.0.30512"
+#define LICENSE_VER_STRING "WI-T3.0.0.30512"
+#define FILE_VER_NUMBER 3, 0, 0, 30512
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30511"
+#define FB_BUILD_NO "30512"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-07-08 14:30:57 UTC (rev 58328)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-07-09 01:43:15 UTC (rev 58329)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30511
+BuildNum=30512
 
 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...> - 2013-07-10 00:40:40
       | 
| Revision: 58333
          http://sourceforge.net/p/firebird/code/58333
Author:   firebirds
Date:     2013-07-10 00:40:38 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-07-09 16:14:58 UTC (rev 58332)
+++ firebird/trunk/ChangeLog	2013-07-10 00:40:38 UTC (rev 58333)
@@ -1,3 +1,11 @@
+ 2013-07-09 16:14  dimitr 
+   M src/jrd/opt.cpp
+Restored (in the modified form) the code wrongly removed three years ago. This acts as a complimentary fix for CORE-4142.
+
+ 2013-07-09 15:18  dimitr 
+   M src/jrd/opt.cpp
+Fixed CORE-4142: Server crashes while preparing a query with DISTINCT and ORDER BY.
+
  2013-07-08 08:37  dimitr 
    M src/jrd/SysFunction.cpp
 CORE-3704: Add new context variables to the SYSTEM namespace.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-07-09 16:14:58 UTC (rev 58332)
+++ firebird/trunk/src/jrd/build_no.h	2013-07-10 00:40:38 UTC (rev 58333)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30512
+  FORMAL BUILD NUMBER:30514
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30512"
-#define FILE_VER_STRING "WI-T3.0.0.30512"
-#define LICENSE_VER_STRING "WI-T3.0.0.30512"
-#define FILE_VER_NUMBER 3, 0, 0, 30512
+#define PRODUCT_VER_STRING "3.0.0.30514"
+#define FILE_VER_STRING "WI-T3.0.0.30514"
+#define LICENSE_VER_STRING "WI-T3.0.0.30514"
+#define FILE_VER_NUMBER 3, 0, 0, 30514
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30512"
+#define FB_BUILD_NO "30514"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-07-09 16:14:58 UTC (rev 58332)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-07-10 00:40:38 UTC (rev 58333)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30512
+BuildNum=30514
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 | 
| 
      
      
      From: <fir...@us...> - 2013-07-12 00:43:43
       | 
| Revision: 58341
          http://sourceforge.net/p/firebird/code/58341
Author:   firebirds
Date:     2013-07-12 00:43:40 +0000 (Fri, 12 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
    firebird/trunk/ChangeLog
    firebird/trunk/src/jrd/build_no.h
    firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2013-07-11 06:00:59 UTC (rev 58340)
+++ firebird/trunk/ChangeLog	2013-07-12 00:43:40 UTC (rev 58341)
@@ -1,3 +1,35 @@
+ 2013-07-11 06:00  dimitr 
+   M src/dsql/StmtNodes.cpp
+Fixed assertion/crash appeared in test bugs.core_1910.
+
+ 2013-07-11 02:21  asfernandes 
+   M src/jrd/DataTypeUtil.cpp
+Fix the assertion with Thomas Beckmann test.
+
+ 2013-07-10 19:49  dimitr 
+   M src/jrd/recsrc/HashJoin.cpp
+Fixed hash join of more than two streams.
+
+ 2013-07-10 11:44  dimitr 
+   M src/dsql/DdlNodes.epp
+   M src/dsql/StmtNodes.cpp
+   M src/jrd/exe.h
+1) Fixed XCP_MESSAGE_LENGTH to represent the real max length. We have the column defined as VARCHAR(1023), so there's no need to subtract the overhead.
+2) Slightly refactored the message buffer management.
+3) Fixed the buffer overrun in the release build.
+
+ 2013-07-10 10:06  dimitr 
+   M src/remote/merge.cpp
+Fixed server crash in both remote server and remote client.
+
+ 2013-07-10 06:55  dimitr 
+   M src/msgs/messages2.sql
+We support 256 contexts now, not 255.
+
+ 2013-07-10 06:21  dimitr 
+   M src/msgs/messages2.sql
+Fixed the error message.
+
  2013-07-09 16:14  dimitr 
    M src/jrd/opt.cpp
 Restored (in the modified form) the code wrongly removed three years ago. This acts as a complimentary fix for CORE-4142.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2013-07-11 06:00:59 UTC (rev 58340)
+++ firebird/trunk/src/jrd/build_no.h	2013-07-12 00:43:40 UTC (rev 58341)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:30514
+  FORMAL BUILD NUMBER:30521
 */
 
-#define PRODUCT_VER_STRING "3.0.0.30514"
-#define FILE_VER_STRING "WI-T3.0.0.30514"
-#define LICENSE_VER_STRING "WI-T3.0.0.30514"
-#define FILE_VER_NUMBER 3, 0, 0, 30514
+#define PRODUCT_VER_STRING "3.0.0.30521"
+#define FILE_VER_STRING "WI-T3.0.0.30521"
+#define LICENSE_VER_STRING "WI-T3.0.0.30521"
+#define FILE_VER_NUMBER 3, 0, 0, 30521
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "30514"
+#define FB_BUILD_NO "30521"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2013-07-11 06:00:59 UTC (rev 58340)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2013-07-12 00:43:40 UTC (rev 58341)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=30514
+BuildNum=30521
 
 NowAt=`pwd`
 cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
 |