diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-11 11:42:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-11 11:42:18 +0200 |
| commit | 9e4f299404c48f7550ac258f1c353da587f8572a (patch) | |
| tree | 77be8d48214a842034eea84bff7d3019c67462de /storage/xtradb/handler/handler0alter.cc | |
| parent | ca325a46d230438ab06b8fe4455f54538dfa11d4 (diff) | |
| parent | be25414828958d9cf829f7e8f162377bbfdfb4db (diff) | |
| download | mariadb-git-9e4f299404c48f7550ac258f1c353da587f8572a.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/xtradb/handler/handler0alter.cc')
| -rw-r--r-- | storage/xtradb/handler/handler0alter.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc index b36010b822a..e876ef1b550 100644 --- a/storage/xtradb/handler/handler0alter.cc +++ b/storage/xtradb/handler/handler0alter.cc @@ -6181,7 +6181,6 @@ foreign_fail: if (!commit_cache_norebuild(ctx, table, trx)) { fk_fail = true; - ut_ad(!prebuilt->trx->check_foreigns); } innobase_rename_columns_cache(ha_alter_info, table, |