Skip to content

Commit 4c35dce

Browse files
committed
Clean up the test mentioned in MDEV-12052.
The test is not expected to crash. With a non-debug server, Valgrind completes in reasonable time without any failure. Also, it does not make sense to store and restore parameters when the parameters are already being restored by a server restart.
1 parent 8971286 commit 4c35dce

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,3 @@ id title
316316
13 lòve
317317
14 LÒVE
318318
DROP TABLE articles;
319-
SET SESSION innodb_ft_enable_stopword=1;
320-
SET GLOBAL innodb_ft_server_stopword_table=default;
321-
SET SESSION innodb_ft_user_stopword_table=default;

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,8 @@
22

33
-- source include/have_innodb.inc
44

5-
# Valgrind would complain about memory leaks when we crash on purpose.
6-
--source include/not_valgrind.inc
7-
# Embedded server does not support crashing
5+
# Embedded server tests do not support restarting
86
--source include/not_embedded.inc
9-
# Avoid CrashReporter popup on Mac
10-
--source include/not_crashrep.inc
11-
12-
let $innodb_ft_server_stopword_table_orig=`SELECT @@innodb_ft_server_stopword_table`;
13-
let $innodb_ft_enable_stopword_orig=`SELECT @@innodb_ft_enable_stopword`;
14-
let $innodb_ft_user_stopword_table_orig=`SELECT @@innodb_ft_user_stopword_table`;
157

168
SELECT @@innodb_ft_server_stopword_table;
179
SELECT @@innodb_ft_enable_stopword;
@@ -414,8 +406,3 @@ SELECT * FROM articles WHERE MATCH (title)
414406
AGAINST ('love' IN NATURAL LANGUAGE MODE);
415407

416408
DROP TABLE articles;
417-
418-
# Restore Values
419-
eval SET SESSION innodb_ft_enable_stopword=$innodb_ft_enable_stopword_orig;
420-
eval SET GLOBAL innodb_ft_server_stopword_table=default;
421-
eval SET SESSION innodb_ft_user_stopword_table=default;

0 commit comments

Comments
 (0)