diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-21 19:20:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-21 19:20:44 +0100 |
| commit | 09a2107b1b2f5567b8a50afec9e54a33284c6233 (patch) | |
| tree | a9f544eb24b6b5ec510fa580cd997356671996d3 /mysql-test/suite/innodb_fts | |
| parent | bbf0c9d4c35034c8634cd9607712d94fac089127 (diff) | |
| parent | 0d622bed4f1a1484af747840c39325c67d7767d4 (diff) | |
| download | mariadb-git-09a2107b1b2f5567b8a50afec9e54a33284c6233.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/suite/innodb_fts')
| -rw-r--r-- | mysql-test/suite/innodb_fts/r/innodb_fts_stopword_charset.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_fts/t/innodb_fts_stopword_charset.test | 15 |
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; |