diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:57:13 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-08-09 09:57:13 +0200 |
| commit | 22d455612b0abbb4b9f527e61348d4c6336b59d5 (patch) | |
| tree | d39436232e232c5a5beb996e86e2b34b05ab5115 /sql/item.h | |
| parent | bfdc4ff22ecf626eb46479e1a0dc1049d61a8d78 (diff) | |
| parent | 75d631f333544de4487a6dd251d6f361e1d55d6b (diff) | |
| download | mariadb-git-22d455612b0abbb4b9f527e61348d4c6336b59d5.tar.gz | |
Merge branch '10.8' into 10.9
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item.h b/sql/item.h index 75b2ed7f882..4d85a654dd4 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1838,14 +1838,14 @@ public: */ virtual bool is_evaluable_expression() const { return true; } - virtual bool check_assignability_to(const Field *to) const + virtual bool check_assignability_to(const Field *to, bool ignore) const { /* "this" must be neither DEFAULT/IGNORE, nor Item_param bound to DEFAULT/IGNORE. */ DBUG_ASSERT(is_evaluable_expression()); - return to->check_assignability_from(type_handler()); + return to->check_assignability_from(type_handler(), ignore); } /** @@ -4088,7 +4088,7 @@ class Item_param :public Item_basic_value, const String *value_query_val_str(THD *thd, String* str) const; Item *value_clone_item(THD *thd); bool is_evaluable_expression() const override; - bool check_assignability_to(const Field *field) const override; + bool check_assignability_to(const Field *field, bool ignore) const override; bool can_return_value() const; public: @@ -6769,7 +6769,7 @@ public: { str->append(STRING_WITH_LEN("default")); } - bool check_assignability_to(const Field *to) const override + bool check_assignability_to(const Field *to, bool ignore) const override { return false; } @@ -6806,7 +6806,7 @@ public: { str->append(STRING_WITH_LEN("ignore")); } - bool check_assignability_to(const Field *to) const override + bool check_assignability_to(const Field *to, bool ignore) const override { return false; } |