mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
sql_acl.cc, item.h:
use of new argument sql_analyse.h: macros from mysql_priv.h. Should be deleted soon. mysql_priv.h: _default_charset_info has been removed item_cmpfunc.h: Use cmp_charset hostname.cc, hash_filo.h: Move charset to constructor argument sql/hash_filo.h: Move charset to constructor argument sql/hostname.cc: Move charset to constructor argument sql/item_cmpfunc.h: Use cmp_charset sql/mysql_priv.h: _default_charset_info has been removed sql/sql_analyse.h: macros from mysql_priv.h. Should be deleted soon. sql/item.h: use of new argument sql/sql_acl.cc: use of new argument
This commit is contained in:
@ -482,7 +482,7 @@ public:
|
||||
int cmp(Item *arg)
|
||||
{
|
||||
char buff[80];
|
||||
String tmp(buff, sizeof(buff), default_charset_info), *res;
|
||||
String tmp(buff, sizeof(buff), cmp_charset), *res;
|
||||
if (!(res= arg->val_str(&tmp)))
|
||||
return 1; /* Can't be right */
|
||||
return sortcmp(value_res, res, cmp_charset);
|
||||
|
Reference in New Issue
Block a user