diff options
author | mysql@home.(none) <> | 2003-03-16 17:19:24 +0400 |
---|---|---|
committer | mysql@home.(none) <> | 2003-03-16 17:19:24 +0400 |
commit | c6efa7a8b7506ad827981a55853acddfcb866f61 (patch) | |
tree | f73c3662ed4bfebf7b1ef0409380b4b6f60a23bd /sql/item_strfunc.cc | |
parent | 5c6c54c09afe1658e03e3c365bb5f84ff2286d37 (diff) | |
download | mariadb-git-c6efa7a8b7506ad827981a55853acddfcb866f61.tar.gz |
New function my_charset_same()
Diffstat (limited to 'sql/item_strfunc.cc')
-rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index f049c13c974..80d85e565e7 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2216,7 +2216,7 @@ bool Item_func_set_collation::fix_fields(THD *thd,struct st_table_list *tables, return 1; } - if (strcmp(args[0]->charset()->csname,set_collation->csname)) + if (!my_charset_same(args[0]->charset(),set_collation)) { my_error(ER_COLLATION_CHARSET_MISMATCH, MYF(0), set_collation->name,args[0]->charset()->csname); |