Skip to content

Commit c88ac73

Browse files
committed
Adjust the test case for MariaDB
1 parent 280879e commit c88ac73

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

mysql-test/suite/innodb_fts/r/fulltext_table_evict.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ f1 TEXT(500),
88
FULLTEXT idx (f1)
99
) ENGINE=InnoDB;
1010
insert into t1 (f1) values ('fjdhfsjhf'),('dhjfhjshfj'),('dhjafjhfj');
11-
# restart
1211
set @save_table_definition_cache=@@global.table_definition_cache;
1312
set @save_table_open_cache=@@global.table_open_cache;
1413
set global table_definition_cache=400;
1514
set global table_open_cache= 1024;
16-
SET GLOBAL DEBUG="+d,crash_if_fts_table_is_evicted";
15+
SET @save_dbug = @@GLOBAL.debug_dbug;
16+
SET GLOBAL DEBUG_DBUG="+d,crash_if_fts_table_is_evicted";
1717
set @@global.table_definition_cache=@save_table_definition_cache;
1818
set @@global.table_open_cache=@save_table_open_cache;
1919
drop table t1;

mysql-test/suite/innodb_fts/t/fulltext_table_evict.test

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
--source include/have_innodb.inc
2+
--source include/have_debug.inc
3+
--source include/big_test.inc
4+
15
--echo #
26
--echo # Bug Bug #27304661 MYSQL CRASH DOING SYNC INDEX ]
37
--echo # [FATAL] INNODB: SEMAPHORE WAIT HAS LASTED > 600
48
--echo #
59

6-
--source include/have_innodb.inc
7-
--source include/have_debug.inc
8-
910
CREATE TABLE t1 (
1011
id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY,
1112
f1 TEXT(500),
@@ -21,7 +22,8 @@ set @save_table_open_cache=@@global.table_open_cache;
2122
set global table_definition_cache=400;
2223
set global table_open_cache= 1024;
2324

24-
SET GLOBAL DEBUG="+d,crash_if_fts_table_is_evicted";
25+
SET @save_dbug = @@GLOBAL.debug_dbug;
26+
SET GLOBAL DEBUG_DBUG="+d,crash_if_fts_table_is_evicted";
2527
#Create 1000 tables, try the best to evict t1 .
2628

2729
--disable_query_log
@@ -39,9 +41,8 @@ while($loop)
3941
dec $loop;
4042
}
4143

42-
SET GLOBAL DEBUG="-d,crash_if_fts_table_is_evicted";
44+
SET GLOBAL DEBUG_DBUG = @save_dbug;
4345
--enable_query_log
4446
set @@global.table_definition_cache=@save_table_definition_cache;
4547
set @@global.table_open_cache=@save_table_open_cache;
4648
drop table t1;
47-

0 commit comments

Comments
 (0)