summaryrefslogtreecommitdiff
path: root/sql/item.h
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2005-08-06 16:58:36 +0500
committerunknown <bar@mysql.com>2005-08-06 16:58:36 +0500
commitc03d28b893af064364b0ae92971663801a136dc8 (patch)
treead88350f4d86a3b7b92d2050d94eb7aa18434a53 /sql/item.h
parent75c06af27784e6fa6ba23f4cd6803bc7574f8253 (diff)
downloadmariadb-git-c03d28b893af064364b0ae92971663801a136dc8.tar.gz
Bug#12371 executing prepared statement fails (illegal mix of collations)
item.cc: item.h: Adding Item_param::safe_charset_converter, not to return collation mix error if parameter can be converted into operation character set. ctype_utf8.result: adding test case ctype_utf8.test: adding test case sql/item.h: Bug #12371 executing prepared statement fails (illegal mix of collations) Adding Item_param::safe_charset_converter, not to returm collation mix error if parameter can be converted into operation character set. sql/item.cc: Bug #12371 executing prepared statement fails (illegal mix of collations) mysql-test/t/ctype_utf8.test: adding test case mysql-test/r/ctype_utf8.result: adding
Diffstat (limited to 'sql/item.h')
-rw-r--r--sql/item.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h
index 825b37fe64c..e49ee485de0 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -617,6 +617,7 @@ public:
basic_const_item returned TRUE.
*/
Item *new_item();
+ Item *safe_charset_converter(CHARSET_INFO *tocs);
/*
Implement by-value equality evaluation if parameter value
is set and is a basic constant (integer, real or string).