summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-06-05 20:05:08 +0200
committerSergei Golubchik <serg@mariadb.org>2015-06-08 21:48:19 +0200
commita4d93e07cc885fbdcef9797b44ddb096d841883f (patch)
tree7c59578577e13ff2160b1aa851cbe4b93edfdc71
parentb41ad55265972d11778843868252953e6ba8a1b5 (diff)
downloadmariadb-git-a4d93e07cc885fbdcef9797b44ddb096d841883f.tar.gz
MDEV-8050 sphinx test cases cannot run with sphinxsearch-2.2.6
remove/replace deprecated options
-rw-r--r--mysql-test/suite/sphinx/my.cnf3
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/suite/sphinx/my.cnf b/mysql-test/suite/sphinx/my.cnf
index a3789a065bf..f60380b7171 100644
--- a/mysql-test/suite/sphinx/my.cnf
+++ b/mysql-test/suite/sphinx/my.cnf
@@ -16,7 +16,6 @@ mem_limit = 32M
[searchd]
read_timeout = 5
max_children = 30
-max_matches = 1000
seamless_rotate = 1
preopen_indexes = 0
unlink_old = 1
@@ -24,7 +23,7 @@ log = @ENV.MYSQLTEST_VARDIR/searchd/sphinx-searchd.log
query_log = @ENV.MYSQLTEST_VARDIR/searchd/sphinx-query.log
#log-error = @ENV.MYSQLTEST_VARDIR/searchd/sphinx.log
pid_file = @ENV.MYSQLTEST_VARDIR/run/searchd.pid
-port = @ENV.SPHINXSEARCH_PORT
+listen = @ENV.SPHINXSEARCH_PORT
[ENV]
SPHINXSEARCH_PORT = @OPT.port