diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-18 15:14:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-18 15:14:12 +0300 |
| commit | 064bfbaf0646f91f0a7ddc4f1e5f3c9844e7571f (patch) | |
| tree | 39494a35db46e1d2deafed8f7e10b806ff28f033 /storage/innobase/dict/dict0mem.cc | |
| parent | 5c8a1249ddeff70a3ffb6ce963a6eed3d55d4510 (diff) | |
| download | mariadb-git-064bfbaf0646f91f0a7ddc4f1e5f3c9844e7571f.tar.gz | |
MDEV-23499 Assertion c.same_type(*o) failed
dict_col_t::same_encoding(), dict_col_t::same_format(): Allow
an instantaneous change of a column to a compatible encoding,
just like ha_innobase::can_convert_string() and similar functions do.
Diffstat (limited to 'storage/innobase/dict/dict0mem.cc')
| -rw-r--r-- | storage/innobase/dict/dict0mem.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index e9e0d33bf9f..b72451e0f34 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -120,7 +120,7 @@ bool dict_col_t::same_encoding(uint16_t a, uint16_t b) { if (const CHARSET_INFO *acs= get_charset(a, MYF(MY_WME))) if (const CHARSET_INFO *bcs= get_charset(b, MYF(MY_WME))) - return Charset(acs).same_encoding(bcs); + return Charset(bcs).encoding_allows_reinterpret_as(acs); return false; } |