diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-08 17:37:22 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-08 17:37:22 +0200 |
| commit | 2ac1edb1c319db967e7424793c799bbc9824b8f4 (patch) | |
| tree | 11274313e57e0f1e782ebed88ada411ad2f2e05d /sql/field.h | |
| parent | e572c745dc04ac7659a40849abce62f39a0b09d4 (diff) | |
| parent | a732d5e2ba3d63a08e20670535d4cd29f667daf0 (diff) | |
| download | mariadb-git-2ac1edb1c319db967e7424793c799bbc9824b8f4.tar.gz | |
Merge 10.5 into 10.6
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 6938dd81211..8d34e259fea 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1760,12 +1760,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); @@ -4052,11 +4046,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; @@ -4211,11 +4200,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; @@ -4654,11 +4638,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; |