summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-09-04 09:55:59 +0400
committerAlexander Barkov <bar@mariadb.com>2019-09-04 10:19:58 +0400
commit7e08ac0b41b50195aa79f6ac185bc69a91a960ca (patch)
tree3a399827dc8e6bd89bbb6d142f21eda8bd659119 /sql/item_cmpfunc.h
parenta071e0e029cd7c155cff1054d9f7f8a6aa898620 (diff)
parentef00ac4c86daf3294c46a45358da636763fb0049 (diff)
downloadmariadb-git-7e08ac0b41b50195aa79f6ac185bc69a91a960ca.tar.gz
Merge 10.2 (up to commit ef00ac4c86daf3294c46a45358da636763fb0049) into 10.3
Diffstat (limited to 'sql/item_cmpfunc.h')
-rw-r--r--sql/item_cmpfunc.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index f2cf91ffb7e..4bb2e0a5dee 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -507,6 +507,7 @@ public:
Item_bool_rowready_func2(THD *thd, Item *a, Item *b):
Item_bool_func2_with_rev(thd, a, b), cmp(tmp_arg, tmp_arg + 1)
{ }
+ Sql_mode_dependency value_depends_on_sql_mode() const;
void print(String *str, enum_query_type query_type)
{
Item_func::print_op(str, query_type);
@@ -2632,6 +2633,7 @@ public:
Item_bool_func2(thd, a, b), canDoTurboBM(FALSE), pattern(0), pattern_len(0),
bmGs(0), bmBc(0), escape_item(escape_arg),
escape_used_in_parsing(escape_used), use_sampling(0), negated(0) {}
+ Sql_mode_dependency value_depends_on_sql_mode() const;
longlong val_int();
enum Functype functype() const { return LIKE_FUNC; }
void print(String *str, enum_query_type query_type);