diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-09 12:27:54 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-09 12:27:54 +0200 |
| commit | 27eaa963ff18d12939f798a78720d73cf6ce0b5d (patch) | |
| tree | 0bca93e0e81c308a3497b7ff59b97d03202cb863 /sql/field.h | |
| parent | 320de65135c6dd1af7c2f34ac0469b80aaf3ddb6 (diff) | |
| parent | e56c12b3cdf57ad29cee0ffe33bd6bc44c963789 (diff) | |
| download | mariadb-git-27eaa963ff18d12939f798a78720d73cf6ce0b5d.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sql/field.h b/sql/field.h index 059163da82d..196dd6fcaae 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1766,12 +1766,6 @@ public: Used by the ALTER TABLE */ virtual bool is_equal(const Column_definition &new_field) const= 0; - // Used as double dispatch pattern: calls virtual method of handler - virtual bool - can_be_converted_by_engine(const Column_definition &new_type) const - { - return false; - } /* convert decimal to longlong with overflow check */ longlong convert_decimal2longlong(const my_decimal *val, bool unsigned_flag, int *err); @@ -4058,11 +4052,6 @@ public: void sql_type(String &str) const override; void sql_rpl_type(String*) const override; bool is_equal(const Column_definition &new_field) const override; - bool can_be_converted_by_engine(const Column_definition &new_type) const - override - { - return table->file->can_convert_string(this, new_type); - } uchar *pack(uchar *to, const uchar *from, uint max_length) override; const uchar *unpack(uchar* to, const uchar *from, const uchar *from_end, uint param_data) override; @@ -4217,11 +4206,6 @@ public: uchar *new_ptr, uint32 length, uchar *new_null_ptr, uint new_null_bit) override; bool is_equal(const Column_definition &new_field) const override; - bool can_be_converted_by_engine(const Column_definition &new_type) const - override - { - return table->file->can_convert_varstring(this, new_type); - } void hash(ulong *nr, ulong *nr2) override; uint length_size() const override { return length_bytes; } void print_key_value(String *out, uint32 length) override; @@ -4660,11 +4644,6 @@ public: uint32 char_length() const override; uint32 character_octet_length() const override; bool is_equal(const Column_definition &new_field) const override; - bool can_be_converted_by_engine(const Column_definition &new_type) const - override - { - return table->file->can_convert_blob(this, new_type); - } void print_key_value(String *out, uint32 length) override; Binlog_type_info binlog_type_info() const override; |