diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-20 15:52:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-20 20:13:28 +0200 |
| commit | 3ef5596505bd8d80fa80d1cf7514550434eb1d79 (patch) | |
| tree | a89c97a6673dd0718f6eb4b3433bd74d576d6865 /sql/field.h | |
| parent | 7e507f262a826c9c799355755541120be8c7352a (diff) | |
| download | mariadb-git-3ef5596505bd8d80fa80d1cf7514550434eb1d79.tar.gz | |
MDEV-13175 Adding a new enum value at the end of a list triggers a table rebuild
Backport of 7e29f2d64fb from 10.1.
Create_field does not set BINARY_FLAG, so the check didn't work at all.
Also, character sets were already compared, so this check would've been
redundant (if it would've worked).
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sql/field.h b/sql/field.h index 2770b8be213..e7bd5532ae6 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1080,10 +1080,6 @@ protected: const uchar *unpack_int64(uchar* to, const uchar *from, const uchar *from_end) { return unpack_int(to, from, from_end, 8); } - bool field_flags_are_binary() - { - return (flags & (BINCMP_FLAG | BINARY_FLAG)) != 0; - } double pos_in_interval_val_real(Field *min, Field *max); double pos_in_interval_val_str(Field *min, Field *max, uint data_offset); }; @@ -2620,6 +2616,7 @@ public: enum_field_types type() const { return MYSQL_TYPE_GEOMETRY; } bool match_collation_to_optimize_range() const { return false; } void sql_type(String &str) const; + uint is_equal(Create_field *new_field); int store(const char *to, uint length, CHARSET_INFO *charset); int store(double nr); int store(longlong nr, bool unsigned_val); @@ -2967,11 +2964,6 @@ public: uint uint_geom_type, Virtual_column_info *vcol_info, engine_option_value *option_list, bool check_exists); - bool field_flags_are_binary() - { - return (flags & (BINCMP_FLAG | BINARY_FLAG)) != 0; - } - ha_storage_media field_storage_type() const { return (ha_storage_media) |