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

[<asf...@us...>]

Revision: 61219
          http://sourceforge.net/p/firebird/code/61219
Author:   asfernandes
Date:     2015-04-03 01:31:15 +0000 (Fri, 03 Apr 2015)
Log Message:
-----------
Fixed (again) CORE-3373 - It is possible to store string with lenght 31 chars into column varchar(25).

Modified Paths:
--------------
    firebird/trunk/doc/WhatsNew
    firebird/trunk/src/jrd/intl.cpp

Modified: firebird/trunk/doc/WhatsNew
===================================================================
--- firebird/trunk/doc/WhatsNew	2015-04-03 00:14:05 UTC (rev 61218)
+++ firebird/trunk/doc/WhatsNew	2015-04-03 01:31:15 UTC (rev 61219)
@@ -231,6 +231,11 @@
       Contributor(s):
         Alex Peshkov <peshkoff at mail.ru>
 
+    * Bugfix CORE-3373
+        It is possible to store string with lenght 31 chars into column VARCHAR(25)
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at gmail.com>
+
     * Bugfix CORE-2848
         Page-level "lock conversion denied" or "lock denied" errors
       Contributor(s):
@@ -1512,11 +1517,6 @@
       Contributor(s):
         Adriano dos Santos Fernandes <adrianosf at gmail.com>
 
-    * Bugfix CORE-3373
-        It is possible to store string with lenght 31 chars into column VARCHAR(25)
-      Contributor(s):
-        Adriano dos Santos Fernandes <adrianosf at gmail.com>
-
     * Bugfix CORE-3338
         Regression: code changes disabled support for expression indexes with COALESCE, CASE and DECODE
       Contributor(s):

Modified: firebird/trunk/src/jrd/intl.cpp
===================================================================
--- firebird/trunk/src/jrd/intl.cpp	2015-04-03 00:14:05 UTC (rev 61218)
+++ firebird/trunk/src/jrd/intl.cpp	2015-04-03 01:31:15 UTC (rev 61219)
@@ -955,7 +955,6 @@
 
 	if (toCharSet->isMultiByte() &&
 		!(toCharSet->getFlags() & CHARSET_LEGACY_SEMANTICS) &&
-		toLength != 31 &&	// allow non CHARSET_LEGACY_SEMANTICS to be used as connection charset
 		src_len > dest_len)
 	{
 		err(Arg::Gds(isc_arith_except) << Arg::Gds(isc_string_truncation) <<

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