Adjust the test case for MariaDB

MariaDB · May 11, 2018 · c88ac73 · c88ac73
1 parent 280879e
commit c88ac73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 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
@@ -8,12 +8,12 @@ f1 TEXT(500),
 FULLTEXT idx (f1)
 ) ENGINE=InnoDB;
 insert into t1 (f1) values ('fjdhfsjhf'),('dhjfhjshfj'),('dhjafjhfj');
-# restart
 set @save_table_definition_cache=@@global.table_definition_cache;
 set @save_table_open_cache=@@global.table_open_cache;
 set global table_definition_cache=400;
 set global table_open_cache= 1024;
-SET GLOBAL DEBUG="+d,crash_if_fts_table_is_evicted";
+SET @save_dbug = @@GLOBAL.debug_dbug;
+SET GLOBAL DEBUG_DBUG="+d,crash_if_fts_table_is_evicted";
 set @@global.table_definition_cache=@save_table_definition_cache;
 set @@global.table_open_cache=@save_table_open_cache;
 drop table t1;
diff --git a/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test b/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test
@@ -1,11 +1,12 @@
+--source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/big_test.inc
+
 --echo #
 --echo # Bug Bug #27304661 MYSQL CRASH DOING SYNC INDEX ]
 --echo # [FATAL] INNODB: SEMAPHORE WAIT HAS LASTED > 600
 --echo #
 
---source include/have_innodb.inc
---source include/have_debug.inc
-
 CREATE TABLE t1 (
        id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
        f1 TEXT(500),
@@ -21,7 +22,8 @@ set @save_table_open_cache=@@global.table_open_cache;
 set global table_definition_cache=400;
 set global table_open_cache= 1024;
 
-SET GLOBAL DEBUG="+d,crash_if_fts_table_is_evicted";
+SET @save_dbug = @@GLOBAL.debug_dbug;
+SET GLOBAL DEBUG_DBUG="+d,crash_if_fts_table_is_evicted";
 #Create 1000 tables, try the best to evict t1 .
 
 --disable_query_log
@@ -39,9 +41,8 @@ while($loop)
   dec $loop;
 }
 
-SET GLOBAL DEBUG="-d,crash_if_fts_table_is_evicted";
+SET GLOBAL DEBUG_DBUG = @save_dbug;
 --enable_query_log
 set @@global.table_definition_cache=@save_table_definition_cache;
 set @@global.table_open_cache=@save_table_open_cache;
 drop table t1;
-