summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-03-18 22:50:14 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-03-18 22:50:14 +0200
commit4c35dce2968ac715b72bb75c2d64d977868f718f (patch)
treebdb35411d19f26b1d1f87c46e9ae2a3bfbf6bb61 /mysql-test
parent8971286a3c9bcd184e4d1b6f4b1bc190771af383 (diff)
downloadmariadb-git-4c35dce2968ac715b72bb75c2d64d977868f718f.tar.gz
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.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/innodb_fts/r/innodb_fts_stopword_charset.result3
-rw-r--r--mysql-test/suite/innodb_fts/t/innodb_fts_stopword_charset.test15
2 files changed, 1 insertions, 17 deletions
diff --git a/mysql-test/suite/innodb_fts/r/innodb_fts_stopword_charset.result b/mysql-test/suite/innodb_fts/r/innodb_fts_stopword_charset.result
index 5f8d5e37680..d8954e73e33 100644
--- a/mysql-test/suite/innodb_fts/r/innodb_fts_stopword_charset.result
+++ b/mysql-test/suite/innodb_fts/r/innodb_fts_stopword_charset.result
@@ -316,6 +316,3 @@ id title
13 lòve
14 LÒVE
DROP TABLE articles;
-SET SESSION innodb_ft_enable_stopword=1;
-SET GLOBAL innodb_ft_server_stopword_table=default;
-SET SESSION innodb_ft_user_stopword_table=default;
diff --git a/mysql-test/suite/innodb_fts/t/innodb_fts_stopword_charset.test b/mysql-test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
index cb49ca0e39f..4092c324bf9 100644
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
@@ -2,16 +2,8 @@
-- source include/have_innodb.inc
-# Valgrind would complain about memory leaks when we crash on purpose.
---source include/not_valgrind.inc
-# Embedded server does not support crashing
+# Embedded server tests do not support restarting
--source include/not_embedded.inc
-# Avoid CrashReporter popup on Mac
---source include/not_crashrep.inc
-
-let $innodb_ft_server_stopword_table_orig=`SELECT @@innodb_ft_server_stopword_table`;
-let $innodb_ft_enable_stopword_orig=`SELECT @@innodb_ft_enable_stopword`;
-let $innodb_ft_user_stopword_table_orig=`SELECT @@innodb_ft_user_stopword_table`;
SELECT @@innodb_ft_server_stopword_table;
SELECT @@innodb_ft_enable_stopword;
@@ -414,8 +406,3 @@ SELECT * FROM articles WHERE MATCH (title)
AGAINST ('love' IN NATURAL LANGUAGE MODE);
DROP TABLE articles;
-
-# Restore Values
-eval SET SESSION innodb_ft_enable_stopword=$innodb_ft_enable_stopword_orig;
-eval SET GLOBAL innodb_ft_server_stopword_table=default;
-eval SET SESSION innodb_ft_user_stopword_table=default;