diff options
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index a9264b78b64..0675bf81dab 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2048,7 +2048,9 @@ void Item_func_match::init_search(bool no_order) return; if (key == NO_SUCH_KEY) - concat=new Item_func_concat_ws(new Item_string(" ",1), default_charset_info, fields); + concat=new Item_func_concat_ws(new Item_string(" ",1, + default_charset_info), + fields); if (master) { @@ -2256,12 +2258,12 @@ double Item_func_match::val() Item *get_system_var(LEX_STRING name) { - if (!my_strcasecmp(name.str,"IDENTITY")) + if (!my_strcasecmp(system_charset_info, name.str, "IDENTITY")) return new Item_int((char*) "@@IDENTITY", current_thd->insert_id(),21); - if (!my_strcasecmp(name.str,"VERSION")) + if (!my_strcasecmp(system_charset_info, name.str, "VERSION")) return new Item_string("@@VERSION",server_version, - (uint) strlen(server_version)); + (uint) strlen(server_version), system_charset_info); net_printf(¤t_thd->net, ER_UNKNOWN_SYSTEM_VARIABLE, name.str); return 0; } |