diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-01 09:19:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-01 09:19:37 +0300 |
| commit | bc862c4ebeb9d706465d580ed58c235704579c05 (patch) | |
| tree | 71a88ec195e4408ecb254040fd365afe820e9086 /storage | |
| parent | b1742a5c951633213d756600ee73ba7bfa7800ff (diff) | |
| parent | f9639c2d1a5e24f1a1533b6277fe7eca3aa3c3c0 (diff) | |
| download | mariadb-git-bc862c4ebeb9d706465d580ed58c235704579c05.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/dict/dict0mem.cc | 7 | ||||
| -rw-r--r-- | storage/xtradb/dict/dict0mem.cc | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index fe01948b70d..9190272a4c5 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -2,7 +2,7 @@ Copyright (c) 1996, 2018, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2013, 2019, MariaDB Corporation. +Copyright (c) 2013, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -564,9 +564,10 @@ dict_mem_table_col_rename_low( foreign->foreign_col_names, foreign->n_fields, NULL, true, false, NULL, NULL, NULL); - /* There must be an equivalent index in this case. */ - ut_ad(new_index != NULL); + /* New index can be null if InnoDB already dropped + the foreign index when FOREIGN_KEY_CHECKS is + disabled */ foreign->foreign_index = new_index; } else { diff --git a/storage/xtradb/dict/dict0mem.cc b/storage/xtradb/dict/dict0mem.cc index f4bbc5c8f06..51ca6de8cd2 100644 --- a/storage/xtradb/dict/dict0mem.cc +++ b/storage/xtradb/dict/dict0mem.cc @@ -2,7 +2,7 @@ Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2013, 2019, MariaDB Corporation. +Copyright (c) 2013, 2020, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -421,9 +421,10 @@ dict_mem_table_col_rename_low( foreign->foreign_col_names, foreign->n_fields, NULL, true, false, NULL, NULL, NULL); - /* There must be an equivalent index in this case. */ - ut_ad(new_index != NULL); + /* New index can be null if XtraDB already dropped + the foreign index when FOREIGN_KEY_CHECKS is + disabled */ foreign->foreign_index = new_index; } else { |