diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-03 17:01:31 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-02-03 17:01:31 +0100 |
commit | f5c5f8e41ecd4d407022d3772ac43075c16824a5 (patch) | |
tree | 8a46fbd9dfd51352800ea606ae52a53ceb239501 /sql/item.h | |
parent | 8d742fe4acb91652fcbeb36506d20ead4ff19e83 (diff) | |
parent | cf63eecef44f189ce2d221612dee9dfc1885ba4e (diff) | |
download | mariadb-git-f5c5f8e41ecd4d407022d3772ac43075c16824a5.tar.gz |
Merge branch '10.5' into 10.6
Diffstat (limited to 'sql/item.h')
-rw-r--r-- | sql/item.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/item.h b/sql/item.h index 468b9932f02..26ea1b17574 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2064,7 +2064,6 @@ public: table during query processing (grouping and so on) */ virtual bool is_result_field() { return 0; } - virtual bool is_json_type() { return false; } virtual bool is_bool_literal() const { return false; } /* This is to handle printing of default values */ virtual bool need_parentheses_in_default() { return false; } @@ -3504,7 +3503,6 @@ public: Collect outer references */ bool collect_outer_ref_processor(void *arg) override; - Item *derived_field_transformer_for_having(THD *thd, uchar *arg) override; friend bool insert_fields(THD *thd, Name_resolution_context *context, const char *db_name, const char *table_name, List_iterator<Item> *it, @@ -3568,7 +3566,6 @@ public: my_decimal *val_decimal_result(my_decimal *) override; bool val_bool_result() override; bool is_null_result() override; - bool is_json_type() override; bool send(Protocol *protocol, st_value *buffer) override; Load_data_outvar *get_load_data_outvar() override { return this; } bool load_data_set_null(THD *thd, const Load_data_param *param) override @@ -5634,7 +5631,6 @@ public: { return ref ? (*ref)->get_typelib() : NULL; } - bool is_json_type() override { return (*ref)->is_json_type(); } bool walk(Item_processor processor, bool walk_subquery, void *arg) override { |