diff options
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 6310d15b4e7..ab2d183dbe5 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -141,7 +141,6 @@ public: class Item_func_md5 :public Item_str_ascii_checksum_func { - String tmp_value; public: Item_func_md5(THD *thd, Item *a): Item_str_ascii_checksum_func(thd, a) {} String *val_str_ascii(String *); @@ -313,7 +312,6 @@ public: class Item_func_decode_histogram :public Item_str_func { - String tmp_value; public: Item_func_decode_histogram(THD *thd, Item *a, Item *b): Item_str_func(thd, a, b) {} @@ -739,10 +737,7 @@ class Item_func_sysconst :public Item_str_func public: Item_func_sysconst(THD *thd): Item_str_func(thd) { collation.set(system_charset_info,DERIVATION_SYSCONST); } - Item *safe_charset_converter(THD *thd, CHARSET_INFO *tocs) - { - return const_charset_converter(thd, tocs, true, fully_qualified_func_name()); - } + Item *safe_charset_converter(THD *thd, CHARSET_INFO *tocs); /* Used to create correct Item name in new converted item in safe_charset_converter, return string representation of this function @@ -754,6 +749,7 @@ public: return mark_unsupported_function(fully_qualified_func_name(), arg, VCOL_SESSION_FUNC); } + bool const_item() const; }; @@ -863,7 +859,7 @@ public: String *val_str(String *) { DBUG_ASSERT(fixed == 1); - return (null_value ? 0 : &str_value); + return null_value ? NULL : &str_value; } bool check_vcol_func_processor(void *arg) { @@ -920,7 +916,6 @@ public: class Item_func_format :public Item_str_ascii_func { - String tmp_str; MY_LOCALE *locale; public: Item_func_format(THD *thd, Item *org, Item *dec): @@ -1003,7 +998,6 @@ public: class Item_func_binlog_gtid_pos :public Item_str_func { - String tmp_value; public: Item_func_binlog_gtid_pos(THD *thd, Item *arg1, Item *arg2): Item_str_func(thd, arg1, arg2) {} @@ -1477,7 +1471,7 @@ public: class Item_func_compress: public Item_str_binary_checksum_func { - String buffer; + String tmp_value; public: Item_func_compress(THD *thd, Item *a) :Item_str_binary_checksum_func(thd, a) {} @@ -1490,7 +1484,7 @@ public: class Item_func_uncompress: public Item_str_binary_checksum_func { - String buffer; + String tmp_value; public: Item_func_uncompress(THD *thd, Item *a) :Item_str_binary_checksum_func(thd, a) {} |