diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-17 14:33:17 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-17 14:33:17 +0200 |
| commit | deeed04137908c0a30ef93f12bbdda0ed06e9c0a (patch) | |
| tree | 21a444496d6ca44888533688e4619c1bd35b1d53 | |
| parent | f5c3c2855d9add187d8b4465d2d88cc87729ef6a (diff) | |
| download | mariadb-git-deeed04137908c0a30ef93f12bbdda0ed06e9c0a.tar.gz | |
Don't show sphinx_error% as this may be a different set of variables in different SPHINX releases
| -rw-r--r-- | mysql-test/suite/sphinx/sphinx.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/sphinx/sphinx.test | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/sphinx/sphinx.result b/mysql-test/suite/sphinx/sphinx.result index 82c76335e0b..5fe11f4671b 100644 --- a/mysql-test/suite/sphinx/sphinx.result +++ b/mysql-test/suite/sphinx/sphinx.result @@ -46,9 +46,6 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE ts ref q q 257 const 3 Using where with pushed condition SET optimizer_switch=@save_optimizer_switch; drop table ts; -show status like "sphinx_error%"; -Variable_name Value -Sphinx_error OFF show status like "sphinx_total%"; Variable_name Value Sphinx_total 2 diff --git a/mysql-test/suite/sphinx/sphinx.test b/mysql-test/suite/sphinx/sphinx.test index 648eec07f63..126131209c5 100644 --- a/mysql-test/suite/sphinx/sphinx.test +++ b/mysql-test/suite/sphinx/sphinx.test @@ -26,6 +26,9 @@ explain select * from ts where q=';groupby=attr:gid'; SET optimizer_switch=@save_optimizer_switch; drop table ts; -show status like "sphinx_error%"; +# +# Don't show sphinx error as this is different between sphinx versions +# show status like "sphinx_error%"; + show status like "sphinx_total%"; show status like "sphinx_word%"; |