mirror of
https://github.com/MariaDB/server.git
synced 2025-07-14 13:41:20 +03:00
A joint patch for MDEV-19284 and MDEV-19285 (INSTANT ALTER)
This patch fixes: - MDEV-19284 INSTANT ALTER with ucs2-to-utf16 conversion produces bad data - MDEV-19285 INSTANT ALTER from ascii_general_ci to latin1_general_ci produces corrupt data These regressions were introduced in 10.4.3 by: - MDEV-15564 Avoid table rebuild in ALTER TABLE on collation or charset changes Changes: 1. Cleanup: Adding a helper method Field_longstr::csinfo_change_allows_instant_alter(), to remove some duplicate code in field.cc. 2. Cleanup: removing Type_handler::Charsets_are_compatible() and static function charsets_are_compatible() and introducing new methods in the recently added class Charset instead: - encoding_allows_reinterpret_as() - encoding_and_order_allow_reinterpret_as() 3. Bug fix: Removing the code that allowed instant conversion for ascii-to->8bit and ucs2-to->utf16. This actually fixes MDEV-19284 and MDEV-19285. 4. Bug fix: Adding a helper method Charset::collation_specific_name(). The old corresponding code in Type_handler::Charsets_are_compatible() was not safe against (badly named) user-defined collations whose character set name can be longer than collation name.
This commit is contained in:
@ -3705,10 +3705,6 @@ public:
|
||||
|
||||
virtual bool
|
||||
Vers_history_point_resolve_unit(THD *thd, Vers_history_point *point) const;
|
||||
|
||||
static bool Charsets_are_compatible(const CHARSET_INFO *old_ci,
|
||||
const CHARSET_INFO *new_ci,
|
||||
bool part_of_a_key);
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user