diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-09-04 09:55:59 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-09-04 10:19:58 +0400 |
| commit | 7e08ac0b41b50195aa79f6ac185bc69a91a960ca (patch) | |
| tree | 3a399827dc8e6bd89bbb6d142f21eda8bd659119 /sql/item_strfunc.h | |
| parent | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (diff) | |
| parent | ef00ac4c86daf3294c46a45358da636763fb0049 (diff) | |
| download | mariadb-git-7e08ac0b41b50195aa79f6ac185bc69a91a960ca.tar.gz | |
Merge 10.2 (up to commit ef00ac4c86daf3294c46a45358da636763fb0049) into 10.3
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 175c76b8f18..a279dd8598f 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -563,6 +563,7 @@ protected: public: Item_func_trim(THD *thd, Item *a, Item *b): Item_str_func(thd, a, b) {} Item_func_trim(THD *thd, Item *a): Item_str_func(thd, a) {} + Sql_mode_dependency value_depends_on_sql_mode() const; String *val_str(String *); bool fix_length_and_dec(); const char *func_name() const { return "trim"; } @@ -600,6 +601,10 @@ class Item_func_ltrim :public Item_func_trim public: Item_func_ltrim(THD *thd, Item *a, Item *b): Item_func_trim(thd, a, b) {} Item_func_ltrim(THD *thd, Item *a): Item_func_trim(thd, a) {} + Sql_mode_dependency value_depends_on_sql_mode() const + { + return Item_func::value_depends_on_sql_mode(); + } String *val_str(String *); const char *func_name() const { return "ltrim"; } const char *mode_name() const { return "leading"; } @@ -1133,6 +1138,7 @@ public: Item_func_pad(thd, arg1, arg2) {} String *val_str(String *); const char *func_name() const { return "rpad"; } + Sql_mode_dependency value_depends_on_sql_mode() const; Item *get_copy(THD *thd) { return get_item_copy<Item_func_rpad>(thd, this); } }; |