diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-11 20:20:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-11 20:20:35 +0200 |
| commit | 810cf362eae28d4a096e0acea7efa67dd32aa05b (patch) | |
| tree | 4f7b2f858e8a57022e790bcac6d88b5e3451ee0f /storage/sphinx | |
| parent | a99efc00a68fe2406343e63b67fc4ea58bed345a (diff) | |
| parent | d199a0ffb0aac86881ea2db7dd78bc07b438dc67 (diff) | |
| download | mariadb-git-810cf362eae28d4a096e0acea7efa67dd32aa05b.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/mysql-test/sphinx/my.cnf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/sphinx/mysql-test/sphinx/my.cnf b/storage/sphinx/mysql-test/sphinx/my.cnf index a3789a065bf..f60380b7171 100644 --- a/storage/sphinx/mysql-test/sphinx/my.cnf +++ b/storage/sphinx/mysql-test/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 |