Remove a useless large test, and add a debug assertion

The test innodb_fts.fulltext_table_evict was only creating 1000 tables with fulltext indexes, only to check that no tables with fulltext indexes are being evicted. The reason why tables containing fulltext indexes cannot be evicted is that fts_optimize_init() invokes dict_table_prevent_eviction().
MariaDB · Sep 27, 2019 · 4ec0c34 · 4ec0c34
1 parent ca9e008
commit 4ec0c34
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 77 deletions.
diff --git a/mysql-test/suite/innodb_fts/r/fulltext_table_evict.result b/mysql-test/suite/innodb_fts/r/fulltext_table_evict.result
diff --git a/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test b/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test
diff --git a/mysql-test/unstable-tests b/mysql-test/unstable-tests
@@ -519,7 +519,6 @@ innodb.xa_recovery                           : MDEV-15279 - mysqld got exception
 #-----------------------------------------------------------------------
 
 innodb_fts.fulltext2                   : Modified in 10.2.26
-innodb_fts.fulltext_table_evict        : Modified in 10.2.27
 innodb_fts.innodb_fts_misc             : Modified in 10.2.27
 innodb_fts.innodb_fts_misc_debug       : MDEV-14156 - Unexpected warning
 innodb_fts.innodb_fts_plugin           : MDEV-13888 - Errors in server log

diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc
@@ -1442,14 +1442,7 @@ dict_make_room_in_cache(
 	        prev_table = UT_LIST_GET_PREV(table_LRU, table);
 
 		if (dict_table_can_be_evicted(table)) {
-
-			DBUG_EXECUTE_IF("crash_if_fts_table_is_evicted",
-			{
-				  if (table->fts &&
-				      dict_table_has_fts_index(table)) {
-					ut_ad(0);
-				  }
-			};);
+			ut_ad(!table->fts);
 			dict_table_remove_from_cache_low(table, TRUE);
 
 			++n_evicted;