diff options
| author | bar@bar.mysql.r18.ru <> | 2003-03-07 12:21:32 +0400 |
|---|---|---|
| committer | bar@bar.mysql.r18.ru <> | 2003-03-07 12:21:32 +0400 |
| commit | 4b5bfe990febcaf0c69a85457f29ffcd1cdeb763 (patch) | |
| tree | 3247730070624b547ff4ab3f2ea2e00169b965d2 /sql/item_cmpfunc.h | |
| parent | d09d2b85fe9c1d1ca5ced68d3494d6f6bb2af2e6 (diff) | |
| download | mariadb-git-4b5bfe990febcaf0c69a85457f29ffcd1cdeb763.tar.gz | |
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
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index cc0ce455019..b9d8615beb4 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -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); |