Commit 4133d294 authored by Jan Lindström's avatar Jan Lindström

Fix crash on innodb_fts.innobase_drop_fts_index_table

We need to pass nonatomic=false (dont allow data dict unlock),
because the transaction may hold locks on SYS_* tables from
previous calls to fts_drop_table().
parent 62ed8801
...@@ -1453,7 +1453,7 @@ fts_drop_table( ...@@ -1453,7 +1453,7 @@ fts_drop_table(
/* Pass nonatomic=false (dont allow data dict unlock), /* Pass nonatomic=false (dont allow data dict unlock),
because the transaction may hold locks on SYS_* tables from because the transaction may hold locks on SYS_* tables from
previous calls to fts_drop_table(). */ previous calls to fts_drop_table(). */
error = row_drop_table_for_mysql(table_name, trx, true, false); error = row_drop_table_for_mysql(table_name, trx, true, false, false);
if (error != DB_SUCCESS) { if (error != DB_SUCCESS) {
ib::error() << "Unable to drop FTS index aux table " ib::error() << "Unable to drop FTS index aux table "
......
...@@ -4590,7 +4590,7 @@ row_merge_drop_table( ...@@ -4590,7 +4590,7 @@ row_merge_drop_table(
ut_a(table->get_ref_count() == 0); ut_a(table->get_ref_count() == 0);
return(row_drop_table_for_mysql(table->name.m_name, return(row_drop_table_for_mysql(table->name.m_name,
trx, false, false)); trx, false, false, false));
} }
/** Write an MLOG_INDEX_LOAD record to indicate in the redo-log /** Write an MLOG_INDEX_LOAD record to indicate in the redo-log
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment