1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A clean-up for the previous patch

Browse Source
This commit is contained in:
Alexander Barkov 2014-09-02 17:34:29 +04:00
parent 1427e1db99
commit b088609a62
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/ctype_utf8.result
View File

@ -5954,6 +5954,13 @@ SET @arg00=_binary 0xFF;
EXECUTE stmt USING @arg00; EXECUTE stmt USING @arg00;
ERROR HY000: Invalid utf8 character string: 'FF' ERROR HY000: Invalid utf8 character string: 'FF'
DEALLOCATE PREPARE stmt; DEALLOCATE PREPARE stmt;
SET NAMES latin1;
PREPARE stmt FROM "SELECT CONCAT(_utf8'a' COLLATE utf8_unicode_ci, ?)";
EXECUTE stmt USING @no_such_var;
CONCAT(_utf8'a' COLLATE utf8_unicode_ci, ?)
NULL
DEALLOCATE PREPARE stmt;
SET NAMES utf8;
# #
# End of 10.0 tests # End of 10.0 tests
# #

5
mysql-test/t/ctype_utf8.test
View File

@ -1675,6 +1675,11 @@ SET @arg00=_binary 0xFF;
--error ER_INVALID_CHARACTER_STRING --error ER_INVALID_CHARACTER_STRING
EXECUTE stmt USING @arg00; EXECUTE stmt USING @arg00;
DEALLOCATE PREPARE stmt; DEALLOCATE PREPARE stmt;
SET NAMES latin1;
PREPARE stmt FROM "SELECT CONCAT(_utf8'a' COLLATE utf8_unicode_ci, ?)";
EXECUTE stmt USING @no_such_var;
DEALLOCATE PREPARE stmt;
SET NAMES utf8;
--echo # --echo #
--echo # End of 10.0 tests --echo # End of 10.0 tests

2
sql/item.cc
View File

@ -1274,6 +1274,8 @@ Item *Item_param::safe_charset_converter(CHARSET_INFO *tocs)
*/ */
if (const_item()) if (const_item())
{ {
if (state == NULL_VALUE)
return this;
uint cnv_errors; uint cnv_errors;
String *ostr= val_str(&cnvstr); String *ostr= val_str(&cnvstr);
if (!needs_charset_converter(tocs)) if (!needs_charset_converter(tocs))