summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-10-01 17:23:28 +0500
committerunknown <bar@bar.mysql.r18.ru>2002-10-01 17:23:28 +0500
commit0d2b6552b14292648afafe7dcd73df4b7975ba65 (patch)
tree9549ce1d413bf0ccd7c4a41c80cbd0663a64097d /sql/item_func.h
parent9564cd43d2d20de54fcdd0ff88f2a23724ffde26 (diff)
downloadmariadb-git-0d2b6552b14292648afafe7dcd73df4b7975ba65.tar.gz
User variables didn't store charset, so this didn't work
as expected and returned default charset instead: SET @x = _koi8_ru'test'; SELECT CHARSET(@x);
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 2e61ed87c3c..d8f6963479d 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -875,7 +875,7 @@ public:
double val();
longlong val_int();
String *val_str(String *str);
- void update_hash(void *ptr, uint length, enum Item_result type);
+ void update_hash(void *ptr, uint length, enum Item_result type, CHARSET_INFO *cs);
bool update();
enum Item_result result_type () const { return cached_result_type; }
bool fix_fields(THD *thd, struct st_table_list *tables, Item **ref);