diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-06-23 07:42:40 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-06-23 07:42:40 +0300 |
| commit | 26de9061e8c4462152b4bcff2b9cbb80cde12de1 (patch) | |
| tree | 517ff7ad9e9f1417960d31172dfeadb0472b9bbb /storage/xtradb/fts/fts0fts.cc | |
| parent | e16780619630676f822248f3637972235481fd96 (diff) | |
| download | mariadb-git-26de9061e8c4462152b4bcff2b9cbb80cde12de1.tar.gz | |
Merge following commit from 5.5:
commit ef92aaf9ece92c873ae0f3448ab2274c958ba3fe
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Wed Jun 22 22:37:28 2016 +0300
MDEV-10083: Orphan ibd file when playing with foreign keys
Analysis: row_drop_table_for_mysql did not allow dropping
referenced table even in case when actual creating of the
referenced table was not successfull if foreign_key_checks=1.
Fix: Allow dropping referenced table even if foreign_key_checks=1
if actual table create returned error.
Diffstat (limited to 'storage/xtradb/fts/fts0fts.cc')
| -rw-r--r-- | storage/xtradb/fts/fts0fts.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/xtradb/fts/fts0fts.cc b/storage/xtradb/fts/fts0fts.cc index fe97b9f7e1a..695e1d25dbe 100644 --- a/storage/xtradb/fts/fts0fts.cc +++ b/storage/xtradb/fts/fts0fts.cc @@ -1919,7 +1919,7 @@ func_exit: trx_rollback_to_savepoint(trx, NULL); - row_drop_table_for_mysql(table->name, trx, FALSE); + row_drop_table_for_mysql(table->name, trx, FALSE, TRUE); trx->error_state = DB_SUCCESS; } @@ -2071,7 +2071,7 @@ fts_create_index_tables_low( trx_rollback_to_savepoint(trx, NULL); - row_drop_table_for_mysql(table_name, trx, FALSE); + row_drop_table_for_mysql(table_name, trx, FALSE, TRUE); trx->error_state = DB_SUCCESS; } |