[Commits] 4133d29: Fix crash on innodb_fts.innobase_drop_fts_index_table

Jan Lindström jan.lindstrom at mariadb.com
Wed Sep 14 15:12:01 EEST 2016


revision-id: 4133d2940e89f7bef640a3c68ce24c4cc9637d1b (mariadb-10.2.1-20-g4133d29)
parent(s): 62ed88017c8a137bd2b57cb55de1badf36f3906a
committer: Jan Lindström
timestamp: 2016-09-14 15:11:01 +0300
message:

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().

---
 storage/innobase/fts/fts0fts.cc   | 2 +-
 storage/innobase/row/row0merge.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/innobase/fts/fts0fts.cc b/storage/innobase/fts/fts0fts.cc
index 13412ca..3451607 100644
--- a/storage/innobase/fts/fts0fts.cc
+++ b/storage/innobase/fts/fts0fts.cc
@@ -1453,7 +1453,7 @@ fts_drop_table(
 		/* Pass nonatomic=false (dont allow data dict unlock),
 		because the transaction may hold locks on SYS_* tables from
 		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) {
 			ib::error() << "Unable to drop FTS index aux table "
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
index 8ab6065..2ab0e49 100644
--- a/storage/innobase/row/row0merge.cc
+++ b/storage/innobase/row/row0merge.cc
@@ -4590,7 +4590,7 @@ row_merge_drop_table(
 	ut_a(table->get_ref_count() == 0);
 
 	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


More information about the commits mailing list