database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

ctype_utf8.result, ctype_utf8.test, item.cc:

Browse Source 
Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.


sql/item.cc:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
mysql-test/t/ctype_utf8.test:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
mysql-test/r/ctype_utf8.result:
  Bug#12371 executing prepared statement fails (illegal mix of collations)
  After review fixes.
This commit is contained in:
unknown
2005-08-29 16:49:01 +05:00
parent 527a9cad7e
commit 593f03d94b
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1001,6 +1001,9 @@ set @a:='bar';
execute my_stmt using @a; execute my_stmt using @a;
a b a b
bar kostja bar kostja
set @a:=NULL;
execute my_stmt using @a;
a b
drop table t1; drop table t1;
CREATE TABLE t1 ( CREATE TABLE t1 (
a varchar(255) NOT NULL default '', a varchar(255) NOT NULL default '',

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

@ -840,6 +840,8 @@ insert into t1 values ('bar','kostja');
prepare my_stmt from "select * from t1 where a=?"; prepare my_stmt from "select * from t1 where a=?";
set @a:='bar'; set @a:='bar';
execute my_stmt using @a; execute my_stmt using @a;
set @a:=NULL;
execute my_stmt using @a;
drop table t1; drop table t1;

8
sql/item.cc
View File

@ -290,7 +290,13 @@ Item *Item_param::safe_charset_converter(CHARSET_INFO *tocs)
{ {
Item_string *conv; Item_string *conv;
uint conv_errors; uint conv_errors;
String tmp, cstr, *ostr= val_str(&tmp); char buf[MAX_FIELD_WIDTH];
String tmp(buf, sizeof(buf), &my_charset_bin);
String cstr, *ostr= val_str(&tmp);
/*
As safe_charset_converter is not executed for
a parameter bound to NULL, ostr should never be 0.
*/
cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors); cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors);
if (conv_errors || !(conv= new Item_string(cstr.ptr(), cstr.length(), if (conv_errors || !(conv= new Item_string(cstr.ptr(), cstr.length(),
cstr.charset(), cstr.charset(),