diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-09-22 20:22:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-23 20:22:46 +0200 |
| commit | 80b9ce359312c1520623531bf173ee048317fee3 (patch) | |
| tree | 2b6ae2fbaa78af922e9182bb6e5484b6e0c24da3 /sql/item_strfunc.h | |
| parent | 1320ad5b9253256afe98e948d25ed0a423a1e6da (diff) | |
| download | mariadb-git-80b9ce359312c1520623531bf173ee048317fee3.tar.gz | |
MDEV-11553 Can't restore a PERSISTENT column that uses DATE_FORMAT()
3-argument form of DATE_FORMAT
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index a7cad234893..d73bd0b76d7 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -27,8 +27,6 @@ extern size_t username_char_length; -class MY_LOCALE; - class Item_str_func :public Item_func { protected: @@ -932,14 +930,13 @@ public: class Item_func_format :public Item_str_ascii_func { - MY_LOCALE *locale; + const MY_LOCALE *locale; public: Item_func_format(THD *thd, Item *org, Item *dec): Item_str_ascii_func(thd, org, dec) {} Item_func_format(THD *thd, Item *org, Item *dec, Item *lang): Item_str_ascii_func(thd, org, dec, lang) {} - MY_LOCALE *get_locale(Item *item); String *val_str_ascii(String *); void fix_length_and_dec(); const char *func_name() const { return "format"; } |