diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-05 12:15:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-05 12:15:17 +0200 |
| commit | d63e19806108efc1ca8d533841ad2471f2e0c4fe (patch) | |
| tree | e7f63499d0768e3af50b5c576048adbd84f4786f /storage/innobase/dict/dict0mem.cc | |
| parent | 6472c5c015a174ffd680fddc8f20c7a94684a552 (diff) | |
| parent | 03977e8273cbd33c3cbfec191ceee856f973ce1a (diff) | |
| download | mariadb-git-d63e19806108efc1ca8d533841ad2471f2e0c4fe.tar.gz | |
Merge 10.0 into 10.1
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 dd8155c09eb..c67e581621e 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -498,9 +498,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, nth_col, to, s); } |