diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-03-27 15:44:40 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-03-27 15:45:09 +0400 |
| commit | 068450a3828a7ed678081fb57f63950d0828c430 (patch) | |
| tree | b810b63d4aa19d71bee73d18659bbd00ea9efc58 /sql/item_strfunc.h | |
| parent | 0f26f71b496f483061b3f3d801513070a9c3556d (diff) | |
| download | mariadb-git-068450a3828a7ed678081fb57f63950d0828c430.tar.gz | |
MDEV-15689 Fix Item_func_set_collation to pass the collation using CHARSET_INFO instead of Item
Main changes:
- Changing the constructor to accept a CHARSET_INFO pointer, instead of an Item pointer
- Updating the bison grammar accordingly
Additional cleanups:
- Simplifying Item_func_set_collation::eq() by reusing Item_func::eq()
- Removing unused binary_keyword
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 4efc15338e0..da77f29f108 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -1355,9 +1355,10 @@ public: class Item_func_set_collation :public Item_str_func { + CHARSET_INFO *m_set_collation; public: - Item_func_set_collation(THD *thd, Item *a, Item *b): - Item_str_func(thd, a, b) {} + Item_func_set_collation(THD *thd, Item *a, CHARSET_INFO *set_collation): + Item_str_func(thd, a), m_set_collation(set_collation) {} String *val_str(String *); void fix_length_and_dec(); bool eq(const Item *item, bool binary_cmp) const; |