Thread: [Firebird-checkins] SF.net SVN: firebird:[61475] firebird/trunk (Page 54)

A powerful, cross platform, SQL database system

Brought to you by: alexpeshkoff, asfernandes, awharrison, cincura_net, and 5 others

firebird-checkins

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

From: <fir...@us...> - 2015-05-03 00:11:21

Revision: 61475
          http://sourceforge.net/p/firebird/code/61475
Author:   firebirds
Date:     2015-05-03 00:11:18 +0000 (Sun, 03 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-02 03:54:03 UTC (rev 61474)
+++ firebird/trunk/ChangeLog	2015-05-03 00:11:18 UTC (rev 61475)
@@ -1,3 +1,17 @@
+ 2015-05-02 03:54  asfernandes 
+   M src/common/isc_file.cpp
+   M src/common/isc_sync.cpp
+   M src/common/os/win32/isc_ipc.cpp
+   M src/common/unicodeUpper.cpp
+   M src/common/unicodeUpper.h
+   M src/dsql/DdlNodes.h
+   M src/jrd/extds/InternalDS.cpp
+   M src/jrd/jrd.cpp
+   M src/jrd/pcmet.epp
+   M src/jrd/scl.epp
+   M src/jrd/vio.cpp
+Misc.
+
  2015-04-30 15:56  asfernandes 
    M doc/WhatsNew
    M src/dsql/ExprNodes.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-02 03:54:03 UTC (rev 61474)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-03 00:11:18 UTC (rev 61475)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31818
+  FORMAL BUILD NUMBER:31819
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31818"
-#define FILE_VER_STRING "WI-T3.0.0.31818"
-#define LICENSE_VER_STRING "WI-T3.0.0.31818"
-#define FILE_VER_NUMBER 3, 0, 0, 31818
+#define PRODUCT_VER_STRING "3.0.0.31819"
+#define FILE_VER_STRING "WI-T3.0.0.31819"
+#define LICENSE_VER_STRING "WI-T3.0.0.31819"
+#define FILE_VER_NUMBER 3, 0, 0, 31819
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31818"
+#define FB_BUILD_NO "31819"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-02 03:54:03 UTC (rev 61474)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-03 00:11:18 UTC (rev 61475)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31818
+BuildNum=31819
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-04 00:12:36

Revision: 61479
          http://sourceforge.net/p/firebird/code/61479
Author:   firebirds
Date:     2015-05-04 00:12:34 +0000 (Mon, 04 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-03 18:36:30 UTC (rev 61478)
+++ firebird/trunk/ChangeLog	2015-05-04 00:12:34 UTC (rev 61479)
@@ -1,3 +1,15 @@
+ 2015-05-03 18:36  asfernandes 
+   M builds/posix/Makefile.in
+Copy new API include files to the Linux target directory.
+
+ 2015-05-03 06:20  robocop 
+   M src/jrd/pcmet.epp
+Var shadowing.
+
+ 2015-05-03 06:18  robocop 
+   M src/dsql/DdlNodes.h
+Misc.
+
  2015-05-02 03:54  asfernandes 
    M src/common/isc_file.cpp
    M src/common/isc_sync.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-03 18:36:30 UTC (rev 61478)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-04 00:12:34 UTC (rev 61479)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31819
+  FORMAL BUILD NUMBER:31822
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31819"
-#define FILE_VER_STRING "WI-T3.0.0.31819"
-#define LICENSE_VER_STRING "WI-T3.0.0.31819"
-#define FILE_VER_NUMBER 3, 0, 0, 31819
+#define PRODUCT_VER_STRING "3.0.0.31822"
+#define FILE_VER_STRING "WI-T3.0.0.31822"
+#define LICENSE_VER_STRING "WI-T3.0.0.31822"
+#define FILE_VER_NUMBER 3, 0, 0, 31822
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31819"
+#define FB_BUILD_NO "31822"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-03 18:36:30 UTC (rev 61478)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-04 00:12:34 UTC (rev 61479)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31819
+BuildNum=31822
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <hv...@us...> - 2015-05-04 11:45:07

Revision: 61484
          http://sourceforge.net/p/firebird/code/61484
Author:   hvlad
Date:     2015-05-04 11:45:05 +0000 (Mon, 04 May 2015)
Log Message:
-----------
Windows implementation of ISC_utf8Upper. Refactoring. Update VC10 and VC12 builds.

Modified Paths:
--------------
    firebird/trunk/builds/win32/msvc10/common.vcxproj
    firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
    firebird/trunk/builds/win32/msvc12/common.vcxproj
    firebird/trunk/builds/win32/msvc12/common.vcxproj.filters
    firebird/trunk/src/common/isc_file.cpp

Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj	2015-05-04 07:40:13 UTC (rev 61483)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj	2015-05-04 11:45:05 UTC (rev 61484)
@@ -79,6 +79,7 @@
     <ClCompile Include="..\..\..\src\common\TextType.cpp" />
     <ClCompile Include="..\..\..\src\common\ThreadData.cpp" />
     <ClCompile Include="..\..\..\src\common\ThreadStart.cpp" />
+    <ClCompile Include="..\..\..\src\common\unicodeUpper.cpp" />
     <ClCompile Include="..\..\..\src\common\unicode_util.cpp" />
     <ClCompile Include="..\..\..\src\common\utils.cpp" />
     <ClCompile Include="..\..\..\src\common\UtilSvc.cpp" />
@@ -183,6 +184,7 @@
     <ClInclude Include="..\..\..\src\common\TextType.h" />
     <ClInclude Include="..\..\..\src\common\ThreadData.h" />
     <ClInclude Include="..\..\..\src\common\ThreadStart.h" />
+    <ClInclude Include="..\..\..\src\common\unicodeUpper.h" />
     <ClInclude Include="..\..\..\src\common\unicode_util.h" />
     <ClInclude Include="..\..\..\src\common\UtilSvc.h" />
     <ClInclude Include="..\..\..\src\common\utils_proto.h" />

Modified: firebird/trunk/builds/win32/msvc10/common.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/common.vcxproj.filters	2015-05-04 07:40:13 UTC (rev 61483)
+++ firebird/trunk/builds/win32/msvc10/common.vcxproj.filters	2015-05-04 11:45:05 UTC (rev 61484)
@@ -207,6 +207,9 @@
     <ClCompile Include="..\..\..\src\common\DynamicStrings.cpp">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\common\unicodeUpper.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\common\xdr_proto.h">
@@ -518,5 +521,8 @@
     <ClInclude Include="..\..\..\src\common\SimpleStatusVector.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\common\unicodeUpper.h">
+      <Filter>headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: firebird/trunk/builds/win32/msvc12/common.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc12/common.vcxproj	2015-05-04 07:40:13 UTC (rev 61483)
+++ firebird/trunk/builds/win32/msvc12/common.vcxproj	2015-05-04 11:45:05 UTC (rev 61484)
@@ -79,6 +79,7 @@
     <ClCompile Include="..\..\..\src\common\TextType.cpp" />
     <ClCompile Include="..\..\..\src\common\ThreadData.cpp" />
     <ClCompile Include="..\..\..\src\common\ThreadStart.cpp" />
+    <ClCompile Include="..\..\..\src\common\unicodeUpper.cpp" />
     <ClCompile Include="..\..\..\src\common\unicode_util.cpp" />
     <ClCompile Include="..\..\..\src\common\utils.cpp" />
     <ClCompile Include="..\..\..\src\common\UtilSvc.cpp" />
@@ -175,6 +176,7 @@
     <ClInclude Include="..\..\..\src\common\sdltable.h" />
     <ClInclude Include="..\..\..\src\common\sdl_proto.h" />
     <ClInclude Include="..\..\..\src\common\sha.h" />
+    <ClInclude Include="..\..\..\src\common\SimpleStatusVector.h" />
     <ClInclude Include="..\..\..\src\common\StatementMetadata.h" />
     <ClInclude Include="..\..\..\src\common\StatusArg.h" />
     <ClInclude Include="..\..\..\src\common\StatusHolder.h" />
@@ -182,6 +184,7 @@
     <ClInclude Include="..\..\..\src\common\TextType.h" />
     <ClInclude Include="..\..\..\src\common\ThreadData.h" />
     <ClInclude Include="..\..\..\src\common\ThreadStart.h" />
+    <ClInclude Include="..\..\..\src\common\unicodeUpper.h" />
     <ClInclude Include="..\..\..\src\common\unicode_util.h" />
     <ClInclude Include="..\..\..\src\common\UtilSvc.h" />
     <ClInclude Include="..\..\..\src\common\utils_proto.h" />

Modified: firebird/trunk/builds/win32/msvc12/common.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc12/common.vcxproj.filters	2015-05-04 07:40:13 UTC (rev 61483)
+++ firebird/trunk/builds/win32/msvc12/common.vcxproj.filters	2015-05-04 11:45:05 UTC (rev 61484)
@@ -207,6 +207,9 @@
     <ClCompile Include="..\..\..\src\common\DynamicStrings.cpp">
       <Filter>common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\common\unicodeUpper.cpp">
+      <Filter>common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\common\xdr_proto.h">
@@ -515,5 +518,11 @@
     <ClInclude Include="..\..\..\src\common\DynamicStrings.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\common\SimpleStatusVector.h">
+      <Filter>headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\common\unicodeUpper.h">
+      <Filter>headers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

Modified: firebird/trunk/src/common/isc_file.cpp
===================================================================
--- firebird/trunk/src/common/isc_file.cpp	2015-05-04 07:40:13 UTC (rev 61483)
+++ firebird/trunk/src/common/isc_file.cpp	2015-05-04 11:45:05 UTC (rev 61484)
@@ -1706,11 +1706,129 @@
 }
 #endif // HAVE_ICONV_H
 
+#if defined WIN_NT
+
+template <int BUFSIZE>
+class WideCharBuffer
+{
+public:
+	WideCharBuffer() :
+		m_len16(0)
+	{}
+
+	bool fromString(UINT codePage, AbstractString &str)
+	{
+		if (str.isEmpty())
+		{
+			m_len16 = 0;
+			return true;
+		}
+
+		int bufSize = m_utf16.getCapacity();
+		WCHAR* utf16Buffer = m_utf16.getBuffer(bufSize);
+		m_len16 = MultiByteToWideChar(codePage, 0, str.c_str(), str.length(), utf16Buffer, bufSize);
+
+		if (m_len16 == 0)
+		{
+			DWORD err = GetLastError();
+			if (err != ERROR_INSUFFICIENT_BUFFER)
+				return false;
+
+			bufSize = MultiByteToWideChar(codePage, 0, str.c_str(), str.length(), NULL, 0);
+			if (bufSize == 0)
+				return false;
+
+			utf16Buffer = m_utf16.getBuffer(bufSize);
+			m_len16 = MultiByteToWideChar(codePage, 0, str.c_str(), str.length(), utf16Buffer, bufSize);
+		}
+		return (m_len16 != 0);
+	}
+
+	bool toString(UINT codePage, AbstractString &str)
+	{
+		if (m_len16 == 0)
+		{
+			str.resize(0);
+			return true;
+		}
+
+		BOOL defaultCharUsed = FALSE;
+		LPBOOL pDefaultCharUsed = &defaultCharUsed;
+		if (codePage == CP_UTF8 || codePage == CP_UTF7)
+			pDefaultCharUsed = NULL;
+
+		WCHAR* utf16Buffer = m_utf16.begin();
+
+		char* utf8Buffer = str.getBuffer(str.capacity());
+		int len8 = WideCharToMultiByte(codePage, 0, utf16Buffer, m_len16,
+			utf8Buffer, str.capacity(), NULL, pDefaultCharUsed);
+
+		if (len8 == 0 || defaultCharUsed)
+		{
+			DWORD err = GetLastError();
+			if (err != ERROR_INSUFFICIENT_BUFFER)
+				return false;
+
+			len8 = WideCharToMultiByte(codePage, 0, utf16Buffer, m_len16, NULL, 0, NULL, pDefaultCharUsed);
+			if (len8 == 0 || defaultCharUsed)
+				return false;
+
+			utf8Buffer = str.getBuffer(len8);
+			len8 = WideCharToMultiByte(codePage, 0, utf16Buffer, m_len16, utf8Buffer, len8, NULL, pDefaultCharUsed);
+		}
+		if (len8 == 0 || defaultCharUsed)
+			return false;
+
+		str.resize(len8);
+		return true;
+	}
+
+	WCHAR* getBuffer()
+	{
+		return m_utf16.begin();
+	}
+
+	int getLength()
+	{
+		return m_len16;
+	}
+
+private:
+	HalfStaticArray<WCHAR, BUFSIZE> m_utf16;
+	int m_len16;
+};
+
+#endif // WIN_NT
+
+
 void ISC_utf8Upper(Firebird::AbstractString& str)
 {
-	//// FIXME: What about Windows?
+	if (str.isEmpty())
+		return;
 
-#ifdef HAVE_ICONV_H
+#if defined(WIN_NT)
+	WideCharBuffer<256> wBuffer;
+	
+	bool error = !wBuffer.fromString(CP_UTF8, str);
+	if (!error)
+	{
+		WCHAR* wch = wBuffer.getBuffer();
+		const WCHAR *const end = wch + wBuffer.getLength();
+		for (; wch < end; wch++)
+			*wch = unicodeUpper(*wch);
+
+		error = !wBuffer.toString(CP_UTF8, str);
+	}
+
+	if (error)
+	{
+		DWORD errCode = GetLastError();
+		status_exception::raise(
+			Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
+			Arg::Windows(errCode));
+	}
+
+#elif defined(HAVE_ICONV_H)
 	iConv().utf8ToUnicode.convert(str);
 
 	{ // aligner scope
@@ -1731,61 +1849,16 @@
 		return;
 
 #if defined(WIN_NT)
-	HalfStaticArray<WCHAR, MAX_PATH> utf16;
-	WCHAR* utf16Buffer = utf16.getBuffer(MAX_PATH);
-	int len16 = MultiByteToWideChar(CP_ACP, 0, str.c_str(), str.length(), utf16Buffer, MAX_PATH);
+	WideCharBuffer<MAX_PATH> wBuffer;
 
-	if (len16 == 0)
+	if (!wBuffer.fromString(CP_ACP, str) || !wBuffer.toString(CP_UTF8, str))
 	{
 		DWORD err = GetLastError();
-		if (err != ERROR_INSUFFICIENT_BUFFER)
-		{
-			status_exception::raise(
-				Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
-				Arg::Windows(err));
-		}
-
-		len16 = MultiByteToWideChar(CP_ACP, 0, str.c_str(), str.length(), NULL, 0);
-		if (len16 == 0)
-		{
-			err = GetLastError();
-			status_exception::raise(
-				Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
-				Arg::Windows(err));
-		}
-
-		utf16Buffer = utf16.getBuffer(len16);
-		len16 = MultiByteToWideChar(CP_ACP, 0, str.c_str(), str.length(), utf16Buffer, len16);
+		status_exception::raise(
+			Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
+			Arg::Windows(err));
 	}
 
-	char* utf8Buffer = str.getBuffer(str.capacity());
-	int len8 = WideCharToMultiByte(CP_UTF8, 0, utf16Buffer, len16,
-		utf8Buffer, str.capacity(), NULL, NULL);
-
-	if (len8 == 0)
-	{
-		DWORD err = GetLastError();
-		if (err != ERROR_INSUFFICIENT_BUFFER)
-		{
-			status_exception::raise(
-				Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
-				Arg::Windows(err));
-		}
-
-		len8 = WideCharToMultiByte(CP_UTF8, 0, utf16Buffer, len16, NULL, 0, NULL, NULL);
-		if (len8 == 0)
-		{
-			err = GetLastError();
-			status_exception::raise(
-				Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
-				Arg::Windows(err));
-		}
-
-		utf8Buffer = str.getBuffer(len8);
-		len8 = WideCharToMultiByte(CP_UTF8, 0, utf16Buffer, len16, utf8Buffer, len8, NULL, NULL);
-	}
-	str.resize(len8);
-
 #elif defined(HAVE_ICONV_H)
 	iConv().systemToUtf8.convert(str);
 #endif
@@ -1799,63 +1872,16 @@
 		return;
 
 #if defined(WIN_NT)
-	HalfStaticArray<WCHAR, MAX_PATH> utf16;
-	WCHAR* utf16Buffer = utf16.getBuffer(MAX_PATH);
-	int len16 = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), utf16Buffer, MAX_PATH);
+	WideCharBuffer<MAX_PATH> wBuffer;
 
-	if (len16 == 0)
+	if (!wBuffer.fromString(CP_UTF8, str) || !wBuffer.toString(CP_ACP, str))
 	{
 		DWORD err = GetLastError();
-		if (err != ERROR_INSUFFICIENT_BUFFER)
-		{
-			status_exception::raise(
-				Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
-				Arg::Windows(err));
-		}
-
-		len16 = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), NULL, 0);
-		if (len16 == 0)
-		{
-			err = GetLastError();
-			status_exception::raise(
-				Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
-				Arg::Windows(err));
-		}
-
-		utf16Buffer = utf16.getBuffer(len16);
-		len16 = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.length(), utf16Buffer, len16);
+		status_exception::raise(
+			Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
+			Arg::Windows(err));
 	}
 
-	BOOL defaultCharUsed;
-	char* ansiBuffer = str.getBuffer(str.capacity());
-	int len8 = WideCharToMultiByte(CP_ACP, 0, utf16Buffer, len16,
-		ansiBuffer, str.capacity(), NULL, &defaultCharUsed);
-
-	if (len8 == 0 || defaultCharUsed)
-	{
-		DWORD err = GetLastError();
-		if (err != ERROR_INSUFFICIENT_BUFFER)
-		{
-			status_exception::raise(
-				Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
-				Arg::Windows(err));
-		}
-
-		len8 = WideCharToMultiByte(CP_ACP, 0, utf16Buffer, len16, NULL, 0, NULL, &defaultCharUsed);
-		if (len8 == 0 || defaultCharUsed)
-		{
-			err = GetLastError();
-			status_exception::raise(
-				Arg::Gds(isc_bad_conn_str) << Arg::Gds(isc_transliteration_failed) <<
-				Arg::Windows(err));
-		}
-
-		ansiBuffer = str.getBuffer(len8);
-		len8 = WideCharToMultiByte(CP_ACP, 0, utf16Buffer, len16,
-			ansiBuffer, len8, NULL, &defaultCharUsed);
-	}
-	str.resize(len8);
-
 #elif defined(HAVE_ICONV_H)
 	iConv().utf8ToSystem.convert(str);
 #endif

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

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

From: <asf...@us...> - 2015-05-04 16:24:12

Revision: 61485
          http://sourceforge.net/p/firebird/code/61485
Author:   asfernandes
Date:     2015-05-04 16:24:10 +0000 (Mon, 04 May 2015)
Log Message:
-----------
Fixed CORE-4781 - Maximum string length (32765 bytes) is not validated.

Modified Paths:
--------------
    firebird/trunk/lang_helpers/gds_codes.ftn
    firebird/trunk/lang_helpers/gds_codes.pas
    firebird/trunk/src/dsql/Parser.cpp
    firebird/trunk/src/include/gen/codetext.h
    firebird/trunk/src/include/gen/iberror.h
    firebird/trunk/src/include/gen/msgs.h
    firebird/trunk/src/include/gen/sql_code.h
    firebird/trunk/src/include/gen/sql_state.h
    firebird/trunk/src/msgs/facilities2.sql
    firebird/trunk/src/msgs/messages2.sql
    firebird/trunk/src/msgs/system_errors2.sql

Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/lang_helpers/gds_codes.ftn	2015-05-04 16:24:10 UTC (rev 61485)
@@ -2332,6 +2332,8 @@
       PARAMETER (GDS__dsql_wlock_conflict              = 336397329)
       INTEGER*4 GDS__dsql_max_exception_arguments    
       PARAMETER (GDS__dsql_max_exception_arguments     = 336397330)
+      INTEGER*4 GDS__dsql_string_length              
+      PARAMETER (GDS__dsql_string_length               = 336397331)
       INTEGER*4 GDS__gsec_cant_open_db               
       PARAMETER (GDS__gsec_cant_open_db                = 336723983)
       INTEGER*4 GDS__gsec_switches_error             

Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/lang_helpers/gds_codes.pas	2015-05-04 16:24:10 UTC (rev 61485)
@@ -1173,6 +1173,7 @@
 	gds_dsql_wlock_aggregates            = 336397328;
 	gds_dsql_wlock_conflict              = 336397329;
 	gds_dsql_max_exception_arguments     = 336397330;
+	gds_dsql_string_length               = 336397331;
 	gds_gsec_cant_open_db                = 336723983;
 	gds_gsec_switches_error              = 336723984;
 	gds_gsec_no_op_spec                  = 336723985;

Modified: firebird/trunk/src/dsql/Parser.cpp
===================================================================
--- firebird/trunk/src/dsql/Parser.cpp	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/src/dsql/Parser.cpp	2015-05-04 16:24:10 UTC (rev 61485)
@@ -483,6 +483,18 @@
 			}
 			*p = *lex.ptr++;
 		}
+
+		if (p - buffer > MAX_COLUMN_SIZE - sizeof(USHORT))
+		{
+			if (buffer != string)
+				gds__free (buffer);
+
+			ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
+					  Arg::Gds(isc_dsql_string_length) <<
+					  Arg::Num(p - buffer) <<
+					  Arg::Num(MAX_COLUMN_SIZE - sizeof(USHORT)));
+		}
+
 		if (c == '"')
 		{
 			stmt_ambiguous = true;
@@ -654,6 +666,14 @@
 					byte = c;
 			}
 
+			if (temp.length() > MAX_COLUMN_SIZE - sizeof(USHORT))
+			{
+				ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
+						  Arg::Gds(isc_dsql_string_length) <<
+						  Arg::Num(temp.length()) <<
+						  Arg::Num(MAX_COLUMN_SIZE - sizeof(USHORT)));
+			}
+
 			yylval.intlStringPtr = newIntlString(temp, "BINARY");
 
 			return STRING;
@@ -693,9 +713,18 @@
 		{
 			if (*lex.ptr == endChar && *++lex.ptr == '\'')
 			{
-				yylval.intlStringPtr = newIntlString(
-					Firebird::string(lex.last_token + 3, lex.ptr - lex.last_token - 4));
+				size_t len = lex.ptr - lex.last_token - 4;
 
+				if (len > MAX_COLUMN_SIZE - sizeof(USHORT))
+				{
+					ERRD_post(Arg::Gds(isc_sqlerr) << Arg::Num(-104) <<
+							  Arg::Gds(isc_dsql_string_length) <<
+							  Arg::Num(len) <<
+							  Arg::Num(MAX_COLUMN_SIZE - sizeof(USHORT)));
+				}
+
+				yylval.intlStringPtr = newIntlString(Firebird::string(lex.last_token + 3, len));
+
 				++lex.ptr;
 
 				mark.length = lex.ptr - lex.last_token;

Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/src/include/gen/codetext.h	2015-05-04 16:24:10 UTC (rev 61485)
@@ -1162,6 +1162,7 @@
 	{"dsql_wlock_aggregates", 336397328},
 	{"dsql_wlock_conflict", 336397329},
 	{"dsql_max_exception_arguments", 336397330},
+	{"dsql_string_length", 336397331},
 	{"gsec_cant_open_db", 336723983},
 	{"gsec_switches_error", 336723984},
 	{"gsec_no_op_spec", 336723985},

Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/src/include/gen/iberror.h	2015-05-04 16:24:10 UTC (rev 61485)
@@ -1196,6 +1196,7 @@
 const ISC_STATUS isc_dsql_wlock_aggregates            = 336397328L;
 const ISC_STATUS isc_dsql_wlock_conflict              = 336397329L;
 const ISC_STATUS isc_dsql_max_exception_arguments     = 336397330L;
+const ISC_STATUS isc_dsql_string_length               = 336397331L;
 const ISC_STATUS isc_gsec_cant_open_db                = 336723983L;
 const ISC_STATUS isc_gsec_switches_error              = 336723984L;
 const ISC_STATUS isc_gsec_no_op_spec                  = 336723985L;
@@ -1298,7 +1299,7 @@
 const ISC_STATUS isc_trace_switch_param_miss          = 337182758L;
 const ISC_STATUS isc_trace_param_act_notcompat        = 337182759L;
 const ISC_STATUS isc_trace_mandatory_switch_miss      = 337182760L;
-const ISC_STATUS isc_err_max                          = 1242;
+const ISC_STATUS isc_err_max                          = 1243;
 
 #else /* c definitions */
 
@@ -2464,6 +2465,7 @@
 #define isc_dsql_wlock_aggregates            336397328L
 #define isc_dsql_wlock_conflict              336397329L
 #define isc_dsql_max_exception_arguments     336397330L
+#define isc_dsql_string_length               336397331L
 #define isc_gsec_cant_open_db                336723983L
 #define isc_gsec_switches_error              336723984L
 #define isc_gsec_no_op_spec                  336723985L
@@ -2566,7 +2568,7 @@
 #define isc_trace_switch_param_miss          337182758L
 #define isc_trace_param_act_notcompat        337182759L
 #define isc_trace_mandatory_switch_miss      337182760L
-#define isc_err_max                          1242
+#define isc_err_max                          1243
 
 #endif
 

Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/src/include/gen/msgs.h	2015-05-04 16:24:10 UTC (rev 61485)
@@ -1165,6 +1165,7 @@
 	{336397328, "WITH LOCK cannot be used with aggregates"},		/* dsql_wlock_aggregates */
 	{336397329, "WITH LOCK cannot be used with @1"},		/* dsql_wlock_conflict */
 	{336397330, "Number of arguments (@1) exceeds the maximum (@2) number of EXCEPTION USING arguments"},		/* dsql_max_exception_arguments */
+	{336397331, "String literal with @1 bytes exceeds the maximum length of @2 bytes"},		/* dsql_string_length */
 	{336723983, "unable to open database"},		/* gsec_cant_open_db */
 	{336723984, "error in switch specifications"},		/* gsec_switches_error */
 	{336723985, "no operation specified"},		/* gsec_no_op_spec */

Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/src/include/gen/sql_code.h	2015-05-04 16:24:10 UTC (rev 61485)
@@ -1161,6 +1161,7 @@
 	{336397328, -104}, /* 1040 dsql_wlock_aggregates */
 	{336397329, -104}, /* 1041 dsql_wlock_conflict */
 	{336397330, -901}, /* 1042 dsql_max_exception_arguments */
+	{336397331, -901}, /* 1043 dsql_string_length */
 	{336723983, -901}, /*  15 gsec_cant_open_db */
 	{336723984, -901}, /*  16 gsec_switches_error */
 	{336723985, -901}, /*  17 gsec_no_op_spec */

Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/src/include/gen/sql_state.h	2015-05-04 16:24:10 UTC (rev 61485)
@@ -1161,6 +1161,7 @@
 	{336397328, "42000"}, // 1040 dsql_wlock_aggregates
 	{336397329, "42000"}, // 1041 dsql_wlock_conflict
 	{336397330, "07002"}, // 1042 dsql_max_exception_arguments
+	{336397331, "42000"}, // 1043 dsql_string_length
 	{336723983, "00000"}, //  15 gsec_cant_open_db
 	{336723984, "00000"}, //  16 gsec_switches_error
 	{336723985, "00000"}, //  17 gsec_no_op_spec

Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/src/msgs/facilities2.sql	2015-05-04 16:24:10 UTC (rev 61485)
@@ -10,7 +10,7 @@
 ('1996-11-07 13:39:40', 'INSTALL', 10, 1)
 ('1996-11-07 13:38:41', 'TEST', 11, 4)
 ('2014-05-09 01:30:36', 'GBAK', 12, 361)
-('2015-04-29 12:27:00', 'SQLERR', 13, 1043)
+('2015-04-29 12:27:00', 'SQLERR', 13, 1044)
 ('1996-11-07 13:38:42', 'SQLWARN', 14, 613)
 ('2006-09-10 03:04:31', 'JRD_BUGCHK', 15, 307)
 ('2014-05-07 03:04:46', 'ISQL', 17, 190)

Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/src/msgs/messages2.sql	2015-05-04 16:24:10 UTC (rev 61485)
@@ -2618,6 +2618,7 @@
 ('dsql_wlock_aggregates', 'pass1_rse_impl', 'pass1.cpp', NULL, 13, 1040, NULL, 'WITH LOCK cannot be used with aggregates', NULL, NULL);
 ('dsql_wlock_conflict', NULL, 'pass1.cpp', NULL, 13, 1041, NULL, 'WITH LOCK cannot be used with @1', NULL, NULL);
 ('dsql_max_exception_arguments', NULL, 'StmtNodes.cpp', NULL, 13, 1042, NULL, 'Number of arguments (@1) exceeds the maximum (@2) number of EXCEPTION USING arguments', NULL, NULL);
+('dsql_string_length', NULL, 'Parser.cpp', NULL, 13, 1043, NULL, 'String literal with @1 bytes exceeds the maximum length of @2 bytes', NULL, NULL);
 -- SQLWARN
 (NULL, NULL, NULL, NULL, 14, 100, NULL, 'Row not found for fetch, update or delete, or the result of a query is an empty table.', NULL, NULL);
 (NULL, NULL, NULL, NULL, 14, 101, NULL, 'segment buffer length shorter than expected', NULL, NULL);

Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql	2015-05-04 11:45:05 UTC (rev 61484)
+++ firebird/trunk/src/msgs/system_errors2.sql	2015-05-04 16:24:10 UTC (rev 61485)
@@ -1155,6 +1155,7 @@
 (-104, '42', '000', 13, 1040, 'dsql_wlock_aggregates', NULL, NULL)
 (-104, '42', '000', 13, 1041, 'dsql_wlock_conflict', NULL, NULL)
 (-901, '07', '002', 13, 1042, 'dsql_max_exception_arguments', NULL, NULL)
+(-901, '42', '000', 13, 1043, 'dsql_string_length', NULL, NULL)
 -- GSEC
 (-901, '00', '000', 18, 15, 'gsec_cant_open_db', NULL, NULL)
 (-901, '00', '000', 18, 16, 'gsec_switches_error', NULL, NULL)

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

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

From: <fir...@us...> - 2015-05-05 00:11:38

Revision: 61486
          http://sourceforge.net/p/firebird/code/61486
Author:   firebirds
Date:     2015-05-05 00:11:36 +0000 (Tue, 05 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-04 16:24:10 UTC (rev 61485)
+++ firebird/trunk/ChangeLog	2015-05-05 00:11:36 UTC (rev 61486)
@@ -1,3 +1,25 @@
+ 2015-05-04 16:24  asfernandes 
+   M lang_helpers/gds_codes.ftn
+   M lang_helpers/gds_codes.pas
+   M src/dsql/Parser.cpp
+   M src/include/gen/codetext.h
+   M src/include/gen/iberror.h
+   M src/include/gen/msgs.h
+   M src/include/gen/sql_code.h
+   M src/include/gen/sql_state.h
+   M src/msgs/facilities2.sql
+   M src/msgs/messages2.sql
+   M src/msgs/system_errors2.sql
+Fixed CORE-4781 - Maximum string length (32765 bytes) is not validated.
+
+ 2015-05-04 11:45  hvlad 
+   M builds/win32/msvc10/common.vcxproj
+   M builds/win32/msvc10/common.vcxproj.filters
+   M builds/win32/msvc12/common.vcxproj
+   M builds/win32/msvc12/common.vcxproj.filters
+   M src/common/isc_file.cpp
+Windows implementation of ISC_utf8Upper. Refactoring. Update VC10 and VC12 builds.
+
  2015-05-03 18:36  asfernandes 
    M builds/posix/Makefile.in
 Copy new API include files to the Linux target directory.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-04 16:24:10 UTC (rev 61485)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-05 00:11:36 UTC (rev 61486)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31822
+  FORMAL BUILD NUMBER:31824
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31822"
-#define FILE_VER_STRING "WI-T3.0.0.31822"
-#define LICENSE_VER_STRING "WI-T3.0.0.31822"
-#define FILE_VER_NUMBER 3, 0, 0, 31822
+#define PRODUCT_VER_STRING "3.0.0.31824"
+#define FILE_VER_STRING "WI-T3.0.0.31824"
+#define LICENSE_VER_STRING "WI-T3.0.0.31824"
+#define FILE_VER_NUMBER 3, 0, 0, 31824
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31822"
+#define FB_BUILD_NO "31824"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-04 16:24:10 UTC (rev 61485)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-05 00:11:36 UTC (rev 61486)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31822
+BuildNum=31824
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-06 00:12:17

Revision: 61491
          http://sourceforge.net/p/firebird/code/61491
Author:   firebirds
Date:     2015-05-06 00:12:15 +0000 (Wed, 06 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-05 15:02:58 UTC (rev 61490)
+++ firebird/trunk/ChangeLog	2015-05-06 00:12:15 UTC (rev 61491)
@@ -1,3 +1,7 @@
+ 2015-05-05 12:40  dimitr 
+   M src/isql/isql.epp
+Fixed bad handling of zero-length segments coming from internally filtered blobs. In particular, this fixes ISQL crash in bugs.core_4380.
+
  2015-05-04 16:24  asfernandes 
    M lang_helpers/gds_codes.ftn
    M lang_helpers/gds_codes.pas

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-05 15:02:58 UTC (rev 61490)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-06 00:12:15 UTC (rev 61491)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31824
+  FORMAL BUILD NUMBER:31825
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31824"
-#define FILE_VER_STRING "WI-T3.0.0.31824"
-#define LICENSE_VER_STRING "WI-T3.0.0.31824"
-#define FILE_VER_NUMBER 3, 0, 0, 31824
+#define PRODUCT_VER_STRING "3.0.0.31825"
+#define FILE_VER_STRING "WI-T3.0.0.31825"
+#define LICENSE_VER_STRING "WI-T3.0.0.31825"
+#define FILE_VER_NUMBER 3, 0, 0, 31825
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31824"
+#define FB_BUILD_NO "31825"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-05 15:02:58 UTC (rev 61490)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-06 00:12:15 UTC (rev 61491)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31824
+BuildNum=31825
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-07 00:11:56

Revision: 61498
          http://sourceforge.net/p/firebird/code/61498
Author:   firebirds
Date:     2015-05-07 00:11:53 +0000 (Thu, 07 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-06 18:16:11 UTC (rev 61497)
+++ firebird/trunk/ChangeLog	2015-05-07 00:11:53 UTC (rev 61498)
@@ -1,3 +1,12 @@
+ 2015-05-06 16:25  alexpeshkoff 
+   M src/auth/SecureRemotePassword/server/SrpServer.cpp
+   M src/dsql/DdlNodes.epp
+Some more postfixes for CORE-4760
+
+ 2015-05-06 13:47  alexpeshkoff 
+   M src/remote/client/interface.cpp
+Postfix for CORE-4760: it was bad idea to call upper() method for UTF string
+
  2015-05-05 12:40  dimitr 
    M src/isql/isql.epp
 Fixed bad handling of zero-length segments coming from internally filtered blobs. In particular, this fixes ISQL crash in bugs.core_4380.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-06 18:16:11 UTC (rev 61497)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-07 00:11:53 UTC (rev 61498)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31825
+  FORMAL BUILD NUMBER:31827
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31825"
-#define FILE_VER_STRING "WI-T3.0.0.31825"
-#define LICENSE_VER_STRING "WI-T3.0.0.31825"
-#define FILE_VER_NUMBER 3, 0, 0, 31825
+#define PRODUCT_VER_STRING "3.0.0.31827"
+#define FILE_VER_STRING "WI-T3.0.0.31827"
+#define LICENSE_VER_STRING "WI-T3.0.0.31827"
+#define FILE_VER_NUMBER 3, 0, 0, 31827
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31825"
+#define FB_BUILD_NO "31827"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-06 18:16:11 UTC (rev 61497)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-07 00:11:53 UTC (rev 61498)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31825
+BuildNum=31827
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-09 00:10:39

Revision: 61514
          http://sourceforge.net/p/firebird/code/61514
Author:   firebirds
Date:     2015-05-09 00:10:37 +0000 (Sat, 09 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-08 17:47:20 UTC (rev 61513)
+++ firebird/trunk/ChangeLog	2015-05-09 00:10:37 UTC (rev 61514)
@@ -1,3 +1,7 @@
+ 2015-05-08 16:46  dimitr 
+   M src/jrd/btr.cpp
+Fixed CORE-4786: Problematic key value (when attempt to insert duplicate in PK/UK) is not shown where length of key >= 127 characters.
+
  2015-05-06 16:25  alexpeshkoff 
    M src/auth/SecureRemotePassword/server/SrpServer.cpp
    M src/dsql/DdlNodes.epp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-08 17:47:20 UTC (rev 61513)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-09 00:10:37 UTC (rev 61514)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31827
+  FORMAL BUILD NUMBER:31828
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31827"
-#define FILE_VER_STRING "WI-T3.0.0.31827"
-#define LICENSE_VER_STRING "WI-T3.0.0.31827"
-#define FILE_VER_NUMBER 3, 0, 0, 31827
+#define PRODUCT_VER_STRING "3.0.0.31828"
+#define FILE_VER_STRING "WI-T3.0.0.31828"
+#define LICENSE_VER_STRING "WI-T3.0.0.31828"
+#define FILE_VER_NUMBER 3, 0, 0, 31828
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31827"
+#define FB_BUILD_NO "31828"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-08 17:47:20 UTC (rev 61513)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-09 00:10:37 UTC (rev 61514)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31827
+BuildNum=31828
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-11 00:09:18

Revision: 61519
          http://sourceforge.net/p/firebird/code/61519
Author:   firebirds
Date:     2015-05-11 00:09:16 +0000 (Mon, 11 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-10 20:46:17 UTC (rev 61518)
+++ firebird/trunk/ChangeLog	2015-05-11 00:09:16 UTC (rev 61519)
@@ -1,3 +1,19 @@
+ 2015-05-10 20:46  hvlad 
+   M src/jrd/Attachment.cpp
+   M src/jrd/extds/ExtDS.cpp
+   M src/jrd/extds/ExtDS.h
+   M src/jrd/extds/InternalDS.cpp
+Fixed few stability issues with EDS related with cases when external connection is broken unexpectedly.
+
+ 2015-05-10 03:03  robocop 
+   M src/common/isc_file.cpp
+Misc.
+
+ 2015-05-10 01:12  asfernandes 
+   M src/common/isc_file.cpp
+   M src/msgs/facilities2.sql
+Misc.
+
  2015-05-08 16:46  dimitr 
    M src/jrd/btr.cpp
 Fixed CORE-4786: Problematic key value (when attempt to insert duplicate in PK/UK) is not shown where length of key >= 127 characters.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-10 20:46:17 UTC (rev 61518)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-11 00:09:16 UTC (rev 61519)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31828
+  FORMAL BUILD NUMBER:31831
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31828"
-#define FILE_VER_STRING "WI-T3.0.0.31828"
-#define LICENSE_VER_STRING "WI-T3.0.0.31828"
-#define FILE_VER_NUMBER 3, 0, 0, 31828
+#define PRODUCT_VER_STRING "3.0.0.31831"
+#define FILE_VER_STRING "WI-T3.0.0.31831"
+#define LICENSE_VER_STRING "WI-T3.0.0.31831"
+#define FILE_VER_NUMBER 3, 0, 0, 31831
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31828"
+#define FB_BUILD_NO "31831"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-10 20:46:17 UTC (rev 61518)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-11 00:09:16 UTC (rev 61519)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31828
+BuildNum=31831
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-12 00:10:23

Revision: 61523
          http://sourceforge.net/p/firebird/code/61523
Author:   firebirds
Date:     2015-05-12 00:10:20 +0000 (Tue, 12 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-11 19:18:02 UTC (rev 61522)
+++ firebird/trunk/ChangeLog	2015-05-12 00:10:20 UTC (rev 61523)
@@ -1,3 +1,11 @@
+ 2015-05-11 15:48  asfernandes 
+   M src/gpre/gpre_meta.h
+   M src/gpre/jrdmet.cpp
+   M src/gpre/std/gpre_meta.epp
+Fixed CORE-4782 - Command `SHOW TABLE` fails when the table contains field with unicode collationin its DDL.
+This should fix the problem with QA tests failing with Windows build.
+It also changes Linux build, which was incorrect in a different manner.
+
  2015-05-10 20:46  hvlad 
    M src/jrd/Attachment.cpp
    M src/jrd/extds/ExtDS.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-11 19:18:02 UTC (rev 61522)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-12 00:10:20 UTC (rev 61523)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31831
+  FORMAL BUILD NUMBER:31832
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31831"
-#define FILE_VER_STRING "WI-T3.0.0.31831"
-#define LICENSE_VER_STRING "WI-T3.0.0.31831"
-#define FILE_VER_NUMBER 3, 0, 0, 31831
+#define PRODUCT_VER_STRING "3.0.0.31832"
+#define FILE_VER_STRING "WI-T3.0.0.31832"
+#define LICENSE_VER_STRING "WI-T3.0.0.31832"
+#define FILE_VER_NUMBER 3, 0, 0, 31832
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31831"
+#define FB_BUILD_NO "31832"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-11 19:18:02 UTC (rev 61522)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-12 00:10:20 UTC (rev 61523)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31831
+BuildNum=31832
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-13 00:09:38

Revision: 61532
          http://sourceforge.net/p/firebird/code/61532
Author:   firebirds
Date:     2015-05-13 00:09:35 +0000 (Wed, 13 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-12 19:48:06 UTC (rev 61531)
+++ firebird/trunk/ChangeLog	2015-05-13 00:09:35 UTC (rev 61532)
@@ -1,3 +1,7 @@
+ 2015-05-12 12:17  alexpeshkoff 
+   M src/remote/inet.cpp
+Fixed CORE-4788: Superclassic server hangs when receiving network packet
+
  2015-05-11 15:48  asfernandes 
    M src/gpre/gpre_meta.h
    M src/gpre/jrdmet.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-12 19:48:06 UTC (rev 61531)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-13 00:09:35 UTC (rev 61532)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31832
+  FORMAL BUILD NUMBER:31833
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31832"
-#define FILE_VER_STRING "WI-T3.0.0.31832"
-#define LICENSE_VER_STRING "WI-T3.0.0.31832"
-#define FILE_VER_NUMBER 3, 0, 0, 31832
+#define PRODUCT_VER_STRING "3.0.0.31833"
+#define FILE_VER_STRING "WI-T3.0.0.31833"
+#define LICENSE_VER_STRING "WI-T3.0.0.31833"
+#define FILE_VER_NUMBER 3, 0, 0, 31833
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31832"
+#define FB_BUILD_NO "31833"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-12 19:48:06 UTC (rev 61531)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-13 00:09:35 UTC (rev 61532)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31832
+BuildNum=31833
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-14 00:10:12

Revision: 61539
          http://sourceforge.net/p/firebird/code/61539
Author:   firebirds
Date:     2015-05-14 00:10:09 +0000 (Thu, 14 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-13 15:49:14 UTC (rev 61538)
+++ firebird/trunk/ChangeLog	2015-05-14 00:10:09 UTC (rev 61539)
@@ -1,3 +1,11 @@
+ 2015-05-13 15:19  asfernandes 
+   M src/jrd/SysFunction.cpp
+Fixed CORE-4789 - Prohibit ability to cast timestamps that out of valid range to varchar.
+
+ 2015-05-13 13:24  alexpeshkoff 
+   M src/dsql/dsql.cpp
+Fixed CORE-4785: Bad packet of op_execute kills the server
+
  2015-05-12 12:17  alexpeshkoff 
    M src/remote/inet.cpp
 Fixed CORE-4788: Superclassic server hangs when receiving network packet

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-13 15:49:14 UTC (rev 61538)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-14 00:10:09 UTC (rev 61539)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31833
+  FORMAL BUILD NUMBER:31835
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31833"
-#define FILE_VER_STRING "WI-T3.0.0.31833"
-#define LICENSE_VER_STRING "WI-T3.0.0.31833"
-#define FILE_VER_NUMBER 3, 0, 0, 31833
+#define PRODUCT_VER_STRING "3.0.0.31835"
+#define FILE_VER_STRING "WI-T3.0.0.31835"
+#define LICENSE_VER_STRING "WI-T3.0.0.31835"
+#define FILE_VER_NUMBER 3, 0, 0, 31835
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31833"
+#define FB_BUILD_NO "31835"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-13 15:49:14 UTC (rev 61538)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-14 00:10:09 UTC (rev 61539)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31833
+BuildNum=31835
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-15 00:10:04

Revision: 61546
          http://sourceforge.net/p/firebird/code/61546
Author:   firebirds
Date:     2015-05-15 00:10:02 +0000 (Fri, 15 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-14 20:00:04 UTC (rev 61545)
+++ firebird/trunk/ChangeLog	2015-05-15 00:10:02 UTC (rev 61546)
@@ -1,3 +1,7 @@
+ 2015-05-14 10:04  alexpeshkoff 
+   M src/dsql/dsql.cpp
+Postfix for CORE-4785
+
  2015-05-13 15:19  asfernandes 
    M src/jrd/SysFunction.cpp
 Fixed CORE-4789 - Prohibit ability to cast timestamps that out of valid range to varchar.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-14 20:00:04 UTC (rev 61545)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-15 00:10:02 UTC (rev 61546)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31835
+  FORMAL BUILD NUMBER:31836
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31835"
-#define FILE_VER_STRING "WI-T3.0.0.31835"
-#define LICENSE_VER_STRING "WI-T3.0.0.31835"
-#define FILE_VER_NUMBER 3, 0, 0, 31835
+#define PRODUCT_VER_STRING "3.0.0.31836"
+#define FILE_VER_STRING "WI-T3.0.0.31836"
+#define LICENSE_VER_STRING "WI-T3.0.0.31836"
+#define FILE_VER_NUMBER 3, 0, 0, 31836
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31835"
+#define FB_BUILD_NO "31836"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-14 20:00:04 UTC (rev 61545)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-15 00:10:02 UTC (rev 61546)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31835
+BuildNum=31836
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <asf...@us...> - 2015-05-15 16:10:41

Revision: 61551
          http://sourceforge.net/p/firebird/code/61551
Author:   asfernandes
Date:     2015-05-15 16:10:39 +0000 (Fri, 15 May 2015)
Log Message:
-----------
1) Improvement CORE-4791 - Make INSERTING/UPDATING/DELETING reserved words to fix ambiguity with boolean expresions.
2) Fixed CORE-4735 -  Expression 'where bool_field IS true | false' should also use index as 'where bool_field = true | false' (if such index exists).

Modified Paths:
--------------
    firebird/trunk/doc/sql.extensions/README.data_types
    firebird/trunk/doc/sql.extensions/README.keywords
    firebird/trunk/src/dsql/BoolNodes.cpp
    firebird/trunk/src/dsql/BoolNodes.h
    firebird/trunk/src/dsql/Parser.h
    firebird/trunk/src/dsql/parse.y

Modified: firebird/trunk/doc/sql.extensions/README.data_types
===================================================================
--- firebird/trunk/doc/sql.extensions/README.data_types	2015-05-15 16:08:31 UTC (rev 61550)
+++ firebird/trunk/doc/sql.extensions/README.data_types	2015-05-15 16:10:39 UTC (rev 61551)
@@ -74,9 +74,3 @@
     5. It's allowed to test booleans without compare with TRUE or FALSE. For example,
        "field1 OR field2" and "NOT field1" are valid expressions. It's also allowed to compare with
        others operators, including the new IS operator: "field1 IS FALSE".
-
-    6. For compatibility reasons, the names INSERTING, UPDATING and DELETING (which aren't keywords)
-       work (like in 2.5 and previous) as boolean expressions and work as values (column or
-       variable) in non-booleans expressions. For example, in:
-       SELECT INSERTING, NOT INSERTING FROM TEST WHERE INSERTING AND INSERTING IS TRUE
-       the INSERTING's are respectively recognized as value, keyword, keyword and value.

Modified: firebird/trunk/doc/sql.extensions/README.keywords
===================================================================
--- firebird/trunk/doc/sql.extensions/README.keywords	2015-05-15 16:08:31 UTC (rev 61550)
+++ firebird/trunk/doc/sql.extensions/README.keywords	2015-05-15 16:10:39 UTC (rev 61551)
@@ -221,8 +221,10 @@
   Added as reserved words:
 
     BOOLEAN
+    DELETING *
     DETERMINISTIC
     FALSE
+    INSERTING *
     OVER
     RDB$RECORD_VERSION
     RETURN
@@ -230,6 +232,7 @@
     SQLSTATE
     TRUE
     UNKNOWN
+    UPDATING *
 
   Added as non-reserved words:
 

Modified: firebird/trunk/src/dsql/BoolNodes.cpp
===================================================================
--- firebird/trunk/src/dsql/BoolNodes.cpp	2015-05-15 16:08:31 UTC (rev 61550)
+++ firebird/trunk/src/dsql/BoolNodes.cpp	2015-05-15 16:10:39 UTC (rev 61551)
@@ -343,7 +343,6 @@
 	: TypedNode<BoolExprNode, ExprNode::TYPE_COMPARATIVE_BOOL>(pool),
 	  blrOp(aBlrOp),
 	  dsqlFlag(DFLAG_NONE),
-	  dsqlWasValue(false),
 	  arg1(aArg1),
 	  arg2(aArg2),
 	  arg3(aArg3),
@@ -390,27 +389,6 @@
 	NestConst<ValueExprNode> procArg3 = arg3;
 	FieldNode* fieldNode1;
 
-	// Make INSERTING/UPDATING/DELETING in booleans to read the trigger action.
-
-	if (dsqlWasValue && (fieldNode1 = procArg1->as<FieldNode>()))
-	{
-		static const char* const NAMES[] = {
-			"INSERTING",
-			"UPDATING",
-			"DELETING"
-		};
-
-		for (int i = 0; i < FB_NELEM(NAMES); ++i)
-		{
-			if (fieldNode1->dsqlName == NAMES[i])
-			{
-				procArg1 = FB_NEW(getPool()) InternalInfoNode(getPool(),
-					MAKE_const_slong(INFO_TYPE_TRIGGER_ACTION));
-				procArg2 = MAKE_const_slong(i + 1);
-			}
-		}
-	}
-
 	if (dsqlSpecialArg)
 	{
 		ValueListNode* listNode = dsqlSpecialArg->as<ValueListNode>();
@@ -1571,7 +1549,6 @@
 
 				ComparativeBoolNode* node = FB_NEW(getPool()) ComparativeBoolNode(
 					getPool(), newBlrOp, cmpArg->arg1, cmpArg->arg2);
-				node->dsqlWasValue = cmpArg->dsqlWasValue;
 				node->dsqlSpecialArg = cmpArg->dsqlSpecialArg;
 
 				if (cmpArg->dsqlFlag == ComparativeBoolNode::DFLAG_ANSI_ANY)

Modified: firebird/trunk/src/dsql/BoolNodes.h
===================================================================
--- firebird/trunk/src/dsql/BoolNodes.h	2015-05-15 16:08:31 UTC (rev 61550)
+++ firebird/trunk/src/dsql/BoolNodes.h	2015-05-15 16:10:39 UTC (rev 61551)
@@ -103,7 +103,6 @@
 public:
 	UCHAR blrOp;
 	DsqlFlag dsqlFlag;
-	bool dsqlWasValue;
 	NestConst<ValueExprNode> arg1;
 	NestConst<ValueExprNode> arg2;
 	NestConst<ValueExprNode> arg3;

Modified: firebird/trunk/src/dsql/Parser.h
===================================================================
--- firebird/trunk/src/dsql/Parser.h	2015-05-15 16:08:31 UTC (rev 61550)
+++ firebird/trunk/src/dsql/Parser.h	2015-05-15 16:10:39 UTC (rev 61551)
@@ -213,7 +213,6 @@
 
 		ComparativeBoolNode* cmpNode = newNode<ComparativeBoolNode>(
 			blr_eql, value, MAKE_constant("1", CONSTANT_BOOLEAN));
-		cmpNode->dsqlWasValue = true;
 		return cmpNode;
 	}
 

Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y	2015-05-15 16:08:31 UTC (rev 61550)
+++ firebird/trunk/src/dsql/parse.y	2015-05-15 16:10:39 UTC (rev 61551)
@@ -3829,8 +3829,10 @@
 	| CORR
 	| COVAR_POP
 	| COVAR_SAMP
+	| DELETING
 	| DETERMINISTIC
 	| KW_FALSE
+	| INSERTING
 	| OFFSET
 	| OVER
 	| REGR_AVGX
@@ -3851,6 +3853,7 @@
 	| STDDEV_POP
 	| KW_TRUE
 	| UNKNOWN
+	| UPDATING
 	| VAR_SAMP
 	| VAR_POP
 	;
@@ -5941,13 +5944,9 @@
 	| '(' boolean_value_expression ')'
 		{ $$ = $2; }
 	| value IS boolean_literal
-		{ $$ = newNode<ComparativeBoolNode>(blr_equiv, newNode<BoolAsValueNode>(valueToBool($1)), $3); }
+		{ $$ = newNode<ComparativeBoolNode>(blr_eql, $1, $3); }
 	| value IS NOT boolean_literal
-		{
-			ComparativeBoolNode* node = newNode<ComparativeBoolNode>(blr_equiv,
-				newNode<BoolAsValueNode>(valueToBool($1)), $4);
-			$$ = newNode<NotBoolNode>(node);
-		}
+		{ $$ = newNode<NotBoolNode>(newNode<ComparativeBoolNode>(blr_eql, $1, $4)); }
 	;
 
 %type <boolExprNode> predicate
@@ -5962,6 +5961,7 @@
 	| quantified_predicate
 	| exists_predicate
 	| singular_predicate
+	| trigger_action_predicate
 	;
 
 
@@ -6116,6 +6116,28 @@
 		{ $$ = newNode<RseBoolNode>(blr_unique, $3); }
 	;
 
+%type <boolExprNode> trigger_action_predicate
+trigger_action_predicate
+	: INSERTING
+		{
+			$$ = newNode<ComparativeBoolNode>(blr_eql,
+					newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_TRIGGER_ACTION)),
+					MAKE_const_slong(1));
+		}
+	| UPDATING
+		{
+			$$ = newNode<ComparativeBoolNode>(blr_eql,
+					newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_TRIGGER_ACTION)),
+					MAKE_const_slong(2));
+		}
+	| DELETING
+		{
+			$$ = newNode<ComparativeBoolNode>(blr_eql,
+					newNode<InternalInfoNode>(MAKE_const_slong(INFO_TYPE_TRIGGER_ACTION)),
+					MAKE_const_slong(3));
+		}
+	;
+
 %type <boolExprNode> null_predicate
 null_predicate
 	: value IS KW_NULL
@@ -7502,9 +7524,6 @@
 	| NULLIF
 	| NULLS
 	| STATEMENT
-	| INSERTING
-	| UPDATING
-	| DELETING
 	| FIRST
 	| SKIP
 	| BLOCK					// added in FB 2.0

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

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

From: <fir...@us...> - 2015-05-16 00:10:02

Revision: 61555
          http://sourceforge.net/p/firebird/code/61555
Author:   firebirds
Date:     2015-05-16 00:09:59 +0000 (Sat, 16 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-15 17:15:11 UTC (rev 61554)
+++ firebird/trunk/ChangeLog	2015-05-16 00:09:59 UTC (rev 61555)
@@ -1,3 +1,22 @@
+ 2015-05-15 16:11  alexpeshkoff 
+   M src/remote/client/interface.cpp
+   M src/yvalve/why.cpp
+Fixed CORE-4756: Firebird 3 events broken
+
+ 2015-05-15 16:10  asfernandes 
+   M doc/sql.extensions/README.data_types
+   M doc/sql.extensions/README.keywords
+   M src/dsql/BoolNodes.cpp
+   M src/dsql/BoolNodes.h
+   M src/dsql/Parser.h
+   M src/dsql/parse.y
+1) Improvement CORE-4791 - Make INSERTING/UPDATING/DELETING reserved words to fix ambiguity with boolean expresions.
+2) Fixed CORE-4735 -  Expression 'where bool_field IS true | false' should also use index as 'where bool_field = true | false' (if such index exists).
+
+ 2015-05-15 16:08  alexpeshkoff 
+   M src/common/classes/RefCounted.h
+Make ref.counted pointer recursive-call safe
+
  2015-05-14 10:04  alexpeshkoff 
    M src/dsql/dsql.cpp
 Postfix for CORE-4785

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-15 17:15:11 UTC (rev 61554)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-16 00:09:59 UTC (rev 61555)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31836
+  FORMAL BUILD NUMBER:31839
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31836"
-#define FILE_VER_STRING "WI-T3.0.0.31836"
-#define LICENSE_VER_STRING "WI-T3.0.0.31836"
-#define FILE_VER_NUMBER 3, 0, 0, 31836
+#define PRODUCT_VER_STRING "3.0.0.31839"
+#define FILE_VER_STRING "WI-T3.0.0.31839"
+#define LICENSE_VER_STRING "WI-T3.0.0.31839"
+#define FILE_VER_NUMBER 3, 0, 0, 31839
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31836"
+#define FB_BUILD_NO "31839"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-15 17:15:11 UTC (rev 61554)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-16 00:09:59 UTC (rev 61555)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31836
+BuildNum=31839
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-18 00:10:36

Revision: 61571
          http://sourceforge.net/p/firebird/code/61571
Author:   firebirds
Date:     2015-05-18 00:10:34 +0000 (Mon, 18 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-17 20:06:55 UTC (rev 61570)
+++ firebird/trunk/ChangeLog	2015-05-18 00:10:34 UTC (rev 61571)
@@ -1,3 +1,8 @@
+ 2015-05-17 02:22  asfernandes 
+   M src/common/classes/NoThrowTimeStamp.h
+   M src/jrd/SysFunction.cpp
+Postfix for CORE-4789 - Prohibit ability to cast timestamps that out of valid range to varchar.
+
  2015-05-15 16:11  alexpeshkoff 
    M src/remote/client/interface.cpp
    M src/yvalve/why.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-17 20:06:55 UTC (rev 61570)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-18 00:10:34 UTC (rev 61571)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31839
+  FORMAL BUILD NUMBER:31840
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31839"
-#define FILE_VER_STRING "WI-T3.0.0.31839"
-#define LICENSE_VER_STRING "WI-T3.0.0.31839"
-#define FILE_VER_NUMBER 3, 0, 0, 31839
+#define PRODUCT_VER_STRING "3.0.0.31840"
+#define FILE_VER_STRING "WI-T3.0.0.31840"
+#define LICENSE_VER_STRING "WI-T3.0.0.31840"
+#define FILE_VER_NUMBER 3, 0, 0, 31840
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31839"
+#define FB_BUILD_NO "31840"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-17 20:06:55 UTC (rev 61570)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-18 00:10:34 UTC (rev 61571)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31839
+BuildNum=31840
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-19 00:10:52

Revision: 61579
          http://sourceforge.net/p/firebird/code/61579
Author:   firebirds
Date:     2015-05-19 00:10:50 +0000 (Tue, 19 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-18 19:36:56 UTC (rev 61578)
+++ firebird/trunk/ChangeLog	2015-05-19 00:10:50 UTC (rev 61579)
@@ -1,3 +1,11 @@
+ 2015-05-18 16:46  alexpeshkoff 
+   M src/yvalve/why.cpp
+Fixed CORE-4795: fbclient executes callback function twice
+
+ 2015-05-18 16:01  alexpeshkoff 
+   M src/yvalve/why.cpp
+Fixed CORE-4794: isc_cancel_events returns error invalid events id (handle) (code: 335545021) if event is (no longer) queued
+
  2015-05-17 02:22  asfernandes 
    M src/common/classes/NoThrowTimeStamp.h
    M src/jrd/SysFunction.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-18 19:36:56 UTC (rev 61578)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-19 00:10:50 UTC (rev 61579)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31840
+  FORMAL BUILD NUMBER:31842
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31840"
-#define FILE_VER_STRING "WI-T3.0.0.31840"
-#define LICENSE_VER_STRING "WI-T3.0.0.31840"
-#define FILE_VER_NUMBER 3, 0, 0, 31840
+#define PRODUCT_VER_STRING "3.0.0.31842"
+#define FILE_VER_STRING "WI-T3.0.0.31842"
+#define LICENSE_VER_STRING "WI-T3.0.0.31842"
+#define FILE_VER_NUMBER 3, 0, 0, 31842
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31840"
+#define FB_BUILD_NO "31842"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-18 19:36:56 UTC (rev 61578)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-19 00:10:50 UTC (rev 61579)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31840
+BuildNum=31842
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-21 00:10:17

Revision: 61588
          http://sourceforge.net/p/firebird/code/61588
Author:   firebirds
Date:     2015-05-21 00:10:15 +0000 (Thu, 21 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-20 18:09:35 UTC (rev 61587)
+++ firebird/trunk/ChangeLog	2015-05-21 00:10:15 UTC (rev 61588)
@@ -1,3 +1,11 @@
+ 2015-05-20 15:27  asfernandes 
+   M src/jrd/SimilarToMatcher.h
+Fixed CORE-4740 - SIMILAR TO with quantifier {n,} in the pattern: 1) fails on 2.5 ("Invalid pattern"), 2) strange result in 3.0.
+
+ 2015-05-20 13:07  alexpeshkoff 
+   M src/jrd/jrd.cpp
+Fixed code disabling access to network filenames in embedded mode
+
  2015-05-18 16:46  alexpeshkoff 
    M src/yvalve/why.cpp
 Fixed CORE-4795: fbclient executes callback function twice

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-20 18:09:35 UTC (rev 61587)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-21 00:10:15 UTC (rev 61588)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31842
+  FORMAL BUILD NUMBER:31844
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31842"
-#define FILE_VER_STRING "WI-T3.0.0.31842"
-#define LICENSE_VER_STRING "WI-T3.0.0.31842"
-#define FILE_VER_NUMBER 3, 0, 0, 31842
+#define PRODUCT_VER_STRING "3.0.0.31844"
+#define FILE_VER_STRING "WI-T3.0.0.31844"
+#define LICENSE_VER_STRING "WI-T3.0.0.31844"
+#define FILE_VER_NUMBER 3, 0, 0, 31844
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31842"
+#define FB_BUILD_NO "31844"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-20 18:09:35 UTC (rev 61587)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-21 00:10:15 UTC (rev 61588)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31842
+BuildNum=31844
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <ego...@us...> - 2015-05-28 13:27:14

Revision: 61629
          http://sourceforge.net/p/firebird/code/61629
Author:   egorpugin
Date:     2015-05-28 13:27:11 +0000 (Thu, 28 May 2015)
Log Message:
-----------
[build][cmake] Fix mingw build: removed unix prefixes from output libraries.

Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/builds/cmake/BuildFunctions.cmake
    firebird/trunk/src/CMakeLists.txt

Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-05-28 12:34:33 UTC (rev 61628)
+++ firebird/trunk/CMakeLists.txt	2015-05-28 13:27:11 UTC (rev 61629)
@@ -199,6 +199,11 @@
 endif(WIN32)
 
 if (MINGW)
+    # clear unix-style prefixes
+    set(CMAKE_SHARED_LIBRARY_PREFIX)
+    set(CMAKE_SHARED_MODULE_PREFIX)
+    set(CMAKE_STATIC_LIBRARY_PREFIX)
+
     add_definitions(-D_WIN32_WINNT=0x0600)
 endif()
 

Modified: firebird/trunk/builds/cmake/BuildFunctions.cmake
===================================================================
--- firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-05-28 12:34:33 UTC (rev 61628)
+++ firebird/trunk/builds/cmake/BuildFunctions.cmake	2015-05-28 13:27:11 UTC (rev 61629)
@@ -108,7 +108,7 @@
             set(dir ${dir}/${file}.d)
             add_custom_command(
                 OUTPUT ${out}
-                DEPENDS databases ${in}
+                DEPENDS databases boot_gpre ${in}
                 COMMENT "Calling GPRE master for ${F}"
                 #
                 COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}

Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt	2015-05-28 12:34:33 UTC (rev 61628)
+++ firebird/trunk/src/CMakeLists.txt	2015-05-28 13:27:11 UTC (rev 61629)
@@ -1000,12 +1000,22 @@
 endforeach()
 
 if (WIN32)
+    set(fbclient_lib_src $<CONFIG>/fbclient.lib)
+    set(fbclient_lib_dst fbclient_ms.lib)
+    set( ib_util_lib_src $<CONFIG>/ib_util.lib)
+    set( ib_util_lib_dst ib_util_ms.lib)
+    if (MINGW)
+        set(fbclient_lib_src libfbclient.dll.a)
+        set(fbclient_lib_dst libfbclient.dll.a)
+        set( ib_util_lib_src libib_util.dll.a)
+        set( ib_util_lib_dst libib_util.dll.a)
+    endif()
     add_custom_command(
         TARGET copy_files
         POST_BUILD
         # lib
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different $<CONFIG>/fbclient.lib ${output_dir}/lib/fbclient_ms.lib
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different $<CONFIG>/ib_util.lib ${output_dir}/lib/ib_util_ms.lib
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${fbclient_lib_src} ${output_dir}/lib/${fbclient_lib_dst}
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ib_util_lib_src} ${output_dir}/lib/${ib_util_lib_dst}
         # installers
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/arch-specific/win32/install_classic.bat ${output_dir}/install_classic.bat
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/arch-specific/win32/install_super.bat ${output_dir}/install_super.bat

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

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

From: <fir...@us...> - 2015-05-29 00:09:56

Revision: 61638
          http://sourceforge.net/p/firebird/code/61638
Author:   firebirds
Date:     2015-05-29 00:09:54 +0000 (Fri, 29 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-28 18:36:30 UTC (rev 61637)
+++ firebird/trunk/ChangeLog	2015-05-29 00:09:54 UTC (rev 61638)
@@ -1,3 +1,9 @@
+ 2015-05-28 13:27  egorpugin 
+   M CMakeLists.txt
+   M builds/cmake/BuildFunctions.cmake
+   M src/CMakeLists.txt
+[build][cmake] Fix mingw build: removed unix prefixes from output libraries.
+
  2015-05-20 15:27  asfernandes 
    M src/jrd/SimilarToMatcher.h
 Fixed CORE-4740 - SIMILAR TO with quantifier {n,} in the pattern: 1) fails on 2.5 ("Invalid pattern"), 2) strange result in 3.0.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-28 18:36:30 UTC (rev 61637)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-29 00:09:54 UTC (rev 61638)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31844
+  FORMAL BUILD NUMBER:31845
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31844"
-#define FILE_VER_STRING "WI-T3.0.0.31844"
-#define LICENSE_VER_STRING "WI-T3.0.0.31844"
-#define FILE_VER_NUMBER 3, 0, 0, 31844
+#define PRODUCT_VER_STRING "3.0.0.31845"
+#define FILE_VER_STRING "WI-T3.0.0.31845"
+#define LICENSE_VER_STRING "WI-T3.0.0.31845"
+#define FILE_VER_NUMBER 3, 0, 0, 31845
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31844"
+#define FB_BUILD_NO "31845"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-28 18:36:30 UTC (rev 61637)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-29 00:09:54 UTC (rev 61638)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31844
+BuildNum=31845
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-05-31 00:09:48

Revision: 61662
          http://sourceforge.net/p/firebird/code/61662
Author:   firebirds
Date:     2015-05-31 00:09:46 +0000 (Sun, 31 May 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-30 20:35:05 UTC (rev 61661)
+++ firebird/trunk/ChangeLog	2015-05-31 00:09:46 UTC (rev 61662)
@@ -1,3 +1,8 @@
+ 2015-05-30 19:01  asfernandes 
+   M src/dsql/StmtNodes.cpp
+   M src/dsql/StmtNodes.h
+Fixed CORE-4819 - EXECUTE PROCEDURE's RETURNING_VALUES and EXECUTE STATEMENT's INTO does not check validity of assignments targets leading to bugcheck.
+
  2015-05-28 13:27  egorpugin 
    M CMakeLists.txt
    M builds/cmake/BuildFunctions.cmake

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-30 20:35:05 UTC (rev 61661)
+++ firebird/trunk/src/jrd/build_no.h	2015-05-31 00:09:46 UTC (rev 61662)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31845
+  FORMAL BUILD NUMBER:31846
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31845"
-#define FILE_VER_STRING "WI-T3.0.0.31845"
-#define LICENSE_VER_STRING "WI-T3.0.0.31845"
-#define FILE_VER_NUMBER 3, 0, 0, 31845
+#define PRODUCT_VER_STRING "3.0.0.31846"
+#define FILE_VER_STRING "WI-T3.0.0.31846"
+#define LICENSE_VER_STRING "WI-T3.0.0.31846"
+#define FILE_VER_NUMBER 3, 0, 0, 31846
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31845"
+#define FB_BUILD_NO "31846"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-30 20:35:05 UTC (rev 61661)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-05-31 00:09:46 UTC (rev 61662)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31845
+BuildNum=31846
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-06-01 00:10:47

Revision: 61677
          http://sourceforge.net/p/firebird/code/61677
Author:   firebirds
Date:     2015-06-01 00:10:45 +0000 (Mon, 01 Jun 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-05-31 23:38:17 UTC (rev 61676)
+++ firebird/trunk/ChangeLog	2015-06-01 00:10:45 UTC (rev 61677)
@@ -1,3 +1,32 @@
+ 2015-05-31 23:38  asfernandes 
+   M src/jrd/extds/ExtDS.cpp
+   M src/jrd/extds/InternalDS.cpp
+   M src/remote/inet.cpp
+   M src/yvalve/why.cpp
+Misc.
+
+ 2015-05-31 19:23  dimitr 
+   M src/jrd/RecordSourceNodes.cpp
+Fixed CORE-4798: Regression: MIN/MAX with a join ignores possible index navigation.
+
+ 2015-05-31 18:46  dimitr 
+   M src/jrd/ini.epp
+Fixed CORE-4806: Regression: generators can be seen/modified by unprivileged users.
+
+ 2015-05-31 16:14  dimitr 
+   M src/dsql/AggNodes.cpp
+   M src/jrd/exe.h
+   M src/jrd/opt.cpp
+Fixed CORE-214: Count ( DISTINCT ... ) is too slow.
+
+ 2015-05-31 13:15  dimitr 
+   M src/jrd/btr.cpp
+Postfix for CORE-4786: Problematic key value (when attempt to insert duplicate in PK/UK) is not shown where length of key >= 127 characters.
+
+ 2015-05-31 13:06  dimitr 
+   M src/common/dsc.h
+Fixed CORE-4809: HASH/MERGE JOIN is not used for more than two streams if they are joined via USING/NATURAL clauses and join is based on DBKEY concatenations.
+
  2015-05-30 19:01  asfernandes 
    M src/dsql/StmtNodes.cpp
    M src/dsql/StmtNodes.h

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-05-31 23:38:17 UTC (rev 61676)
+++ firebird/trunk/src/jrd/build_no.h	2015-06-01 00:10:45 UTC (rev 61677)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31846
+  FORMAL BUILD NUMBER:31852
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31846"
-#define FILE_VER_STRING "WI-T3.0.0.31846"
-#define LICENSE_VER_STRING "WI-T3.0.0.31846"
-#define FILE_VER_NUMBER 3, 0, 0, 31846
+#define PRODUCT_VER_STRING "3.0.0.31852"
+#define FILE_VER_STRING "WI-T3.0.0.31852"
+#define LICENSE_VER_STRING "WI-T3.0.0.31852"
+#define FILE_VER_NUMBER 3, 0, 0, 31852
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31846"
+#define FB_BUILD_NO "31852"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-05-31 23:38:17 UTC (rev 61676)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-06-01 00:10:45 UTC (rev 61677)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31846
+BuildNum=31852
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-06-03 00:10:41

Revision: 61697
          http://sourceforge.net/p/firebird/code/61697
Author:   firebirds
Date:     2015-06-03 00:10:38 +0000 (Wed, 03 Jun 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-06-02 15:06:00 UTC (rev 61696)
+++ firebird/trunk/ChangeLog	2015-06-03 00:10:38 UTC (rev 61697)
@@ -1,3 +1,24 @@
+ 2015-06-02 11:07  dimitr 
+   M doc/WhatsNew
+Updated the docs for Beta 2.
+
+ 2015-06-02 10:44  dimitr 
+   M src/remote/remote.h
+Restore the pre-v3 prefetch performance.
+
+ 2015-06-02 10:43  dimitr 
+   M src/dsql/StmtNodes.cpp
+   M src/jrd/JrdStatement.cpp
+   M src/jrd/exe.h
+   M src/jrd/recsrc/BufferedStream.cpp
+   M src/jrd/recsrc/SortedStream.cpp
+   M src/jrd/req.h
+   M src/jrd/vio.cpp
+1) Reverted a more complex refetch logic introduced recently to its original state.
+2) Protected against an undo record being used in VIO modify/erase/writelock routines.
+3) Avoided false deadlocks in read-committed transactions.
+This should cure CORE-4369, CORE-4561 and CORE-4618 at once.
+
  2015-05-31 23:38  asfernandes 
    M src/jrd/extds/ExtDS.cpp
    M src/jrd/extds/InternalDS.cpp

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-06-02 15:06:00 UTC (rev 61696)
+++ firebird/trunk/src/jrd/build_no.h	2015-06-03 00:10:38 UTC (rev 61697)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31852
+  FORMAL BUILD NUMBER:31855
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31852"
-#define FILE_VER_STRING "WI-T3.0.0.31852"
-#define LICENSE_VER_STRING "WI-T3.0.0.31852"
-#define FILE_VER_NUMBER 3, 0, 0, 31852
+#define PRODUCT_VER_STRING "3.0.0.31855"
+#define FILE_VER_STRING "WI-T3.0.0.31855"
+#define LICENSE_VER_STRING "WI-T3.0.0.31855"
+#define FILE_VER_NUMBER 3, 0, 0, 31855
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31852"
+#define FB_BUILD_NO "31855"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-06-02 15:06:00 UTC (rev 61696)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-06-03 00:10:38 UTC (rev 61697)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31852
+BuildNum=31855
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-06-04 00:10:48

Revision: 61719
          http://sourceforge.net/p/firebird/code/61719
Author:   firebirds
Date:     2015-06-04 00:10:45 +0000 (Thu, 04 Jun 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-06-03 18:35:53 UTC (rev 61718)
+++ firebird/trunk/ChangeLog	2015-06-04 00:10:45 UTC (rev 61719)
@@ -1,3 +1,45 @@
+ 2015-06-03 18:01  alexpeshkoff 
+   M src/isql/isql.epp
+Make ISQL display character set when sqlda_display is on
+
+ 2015-06-03 13:57  alexpeshkoff 
+   M src/alice/main/aliceMain.cpp
+   M src/auth/SecurityDatabase/LegacyServer.cpp
+   M src/burp/main/burpMain.cpp
+   M src/burp/split/spit.cpp
+   M src/common/Auth.cpp
+   M src/common/IntlUtil.h
+   A src/common/Tokens.cpp
+   A src/common/Tokens.h
+   M src/common/isc_f_proto.h
+   M src/common/isc_file.cpp
+   D src/common/unicodeUpper.cpp
+   D src/common/unicodeUpper.h
+   M src/common/utils.cpp
+   M src/common/utils_proto.h
+   M src/dsql/DdlNodes.epp
+   M src/gpre/gpre.cpp
+   M src/isql/isql.epp
+   M src/jrd/ini.epp
+   M src/jrd/ini_proto.h
+   M src/jrd/jrd.cpp
+   M src/jrd/scl.epp
+   M src/jrd/svc.cpp
+   M src/jrd/trig.h
+   M src/lock/print.cpp
+   M src/qli/dtr.cpp
+   M src/remote/client/interface.cpp
+   M src/remote/remote.cpp
+   M src/remote/remote.h
+   M src/remote/server/server.cpp
+   M src/utilities/fbsvcmgr/fbsvcmgr.cpp
+   M src/utilities/fbtracemgr/traceMgrMain.cpp
+   M src/utilities/gsec/main/gsecMain.cpp
+   M src/utilities/gstat/main/gstatMain.cpp
+   M src/utilities/nbackup/main/nbkMain.cpp
+   M src/yvalve/preparse.cpp
+Fixed CORE-4811: Make user names behave according to SQL identifiers rules
+
  2015-06-02 11:07  dimitr 
    M doc/WhatsNew
 Updated the docs for Beta 2.

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-06-03 18:35:53 UTC (rev 61718)
+++ firebird/trunk/src/jrd/build_no.h	2015-06-04 00:10:45 UTC (rev 61719)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31855
+  FORMAL BUILD NUMBER:31857
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31855"
-#define FILE_VER_STRING "WI-T3.0.0.31855"
-#define LICENSE_VER_STRING "WI-T3.0.0.31855"
-#define FILE_VER_NUMBER 3, 0, 0, 31855
+#define PRODUCT_VER_STRING "3.0.0.31857"
+#define FILE_VER_STRING "WI-T3.0.0.31857"
+#define LICENSE_VER_STRING "WI-T3.0.0.31857"
+#define FILE_VER_NUMBER 3, 0, 0, 31857
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31855"
+#define FB_BUILD_NO "31857"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-06-03 18:35:53 UTC (rev 61718)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-06-04 00:10:45 UTC (rev 61719)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31855
+BuildNum=31857
 
 NowAt=`pwd`
 cd `dirname $0`

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

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

From: <fir...@us...> - 2015-06-05 00:11:07

Revision: 61730
          http://sourceforge.net/p/firebird/code/61730
Author:   firebirds
Date:     2015-06-05 00:11:04 +0000 (Fri, 05 Jun 2015)
Log Message:
-----------
nightly update

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

Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog	2015-06-04 14:10:15 UTC (rev 61729)
+++ firebird/trunk/ChangeLog	2015-06-05 00:11:04 UTC (rev 61730)
@@ -1,3 +1,16 @@
+ 2015-06-04 14:10  alexpeshkoff 
+   M src/dsql/DdlNodes.epp
+Postfix for CORE-4821: fixed segfault in REVOKE ALL ON ALL
+
+ 2015-06-04 13:43  alexpeshkoff 
+   M src/dsql/DdlNodes.epp
+   M src/jrd/drq.h
+Fixed CORE-4821: ensure CREATE DATABASE right is granted only to roles that do exist in security database
+
+ 2015-06-04 12:07  alexpeshkoff 
+   M src/jrd/jrd.cpp
+Fixed extremely rare segfault when shutting down server - no use in keeping security database(s) opened during shutdown
+
  2015-06-03 18:01  alexpeshkoff 
    M src/isql/isql.epp
 Make ISQL display character set when sqlda_display is on

Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h	2015-06-04 14:10:15 UTC (rev 61729)
+++ firebird/trunk/src/jrd/build_no.h	2015-06-05 00:11:04 UTC (rev 61730)
@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31857
+  FORMAL BUILD NUMBER:31860
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31857"
-#define FILE_VER_STRING "WI-T3.0.0.31857"
-#define LICENSE_VER_STRING "WI-T3.0.0.31857"
-#define FILE_VER_NUMBER 3, 0, 0, 31857
+#define PRODUCT_VER_STRING "3.0.0.31860"
+#define FILE_VER_STRING "WI-T3.0.0.31860"
+#define LICENSE_VER_STRING "WI-T3.0.0.31860"
+#define FILE_VER_NUMBER 3, 0, 0, 31860
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31857"
+#define FB_BUILD_NO "31860"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh	2015-06-04 14:10:15 UTC (rev 61729)
+++ firebird/trunk/src/misc/writeBuildNum.sh	2015-06-05 00:11:04 UTC (rev 61730)
@@ -9,7 +9,7 @@
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31857
+BuildNum=31860
 
 NowAt=`pwd`
 cd `dirname $0`

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

<< < 1 .. 52 53 54 55 56 .. 63 > >> (Page 54 of 63)