diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
| commit | 074c68409921032f8a64416cc4d5ebc35d95dca9 (patch) | |
| tree | 615c99d326fd2ce8c0e3b533b40f0e4e3475bbc1 /storage/innobase/dict/dict0mem.cc | |
| parent | 563efeceece09154f71da6303244b1df36875428 (diff) | |
| parent | df563e0c037f9b2cdb22e145575f92a121b4b529 (diff) | |
| download | mariadb-git-074c68409921032f8a64416cc4d5ebc35d95dca9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/dict/dict0mem.cc')
| -rw-r--r-- | storage/innobase/dict/dict0mem.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index 16633b15267..4d21f90fa97 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -688,9 +688,7 @@ dict_mem_table_col_rename( s += len + 1; } - /* This could fail if the data dictionaries are out of sync. - Proceed with the renaming anyway. */ - ut_ad(!strcmp(from, s)); + ut_ad(!my_strcasecmp(system_charset_info, from, s)); dict_mem_table_col_rename_low(table, static_cast<unsigned>(nth_col), to, s, is_virtual); |