From 1df4e47defb9fce158ebbcf1eb7a01fa287c119a Mon Sep 17 00:00:00 2001 From: Anel Husakovic Date: Wed, 8 May 2019 06:40:37 -0700 Subject: MDEV 1930 Sphinx unable to connect using a host name - Enable the test `sphinx.sphinx` which was disabled by MDEV 10986, comit ee0094d2fd48dac0c - ADd test case to `sphinx.sphinx` to cover host as localhost instead of 127.0.0.1 - Add result file for single test --- storage/sphinx/mysql-test/sphinx/disabled.def | 2 +- storage/sphinx/mysql-test/sphinx/sphinx.result | 20 ++++++++++++++++++++ storage/sphinx/mysql-test/sphinx/sphinx.test | 13 +++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/storage/sphinx/mysql-test/sphinx/disabled.def b/storage/sphinx/mysql-test/sphinx/disabled.def index a85b8b71e52..b82672c0826 100644 --- a/storage/sphinx/mysql-test/sphinx/disabled.def +++ b/storage/sphinx/mysql-test/sphinx/disabled.def @@ -1,2 +1,2 @@ -sphinx : MDEV-10986, MDEV-10985 +#sphinx : MDEV-10986, MDEV-10985 union-5539 : MDEV-10986, MDEV-10985 diff --git a/storage/sphinx/mysql-test/sphinx/sphinx.result b/storage/sphinx/mysql-test/sphinx/sphinx.result index 3536ba42af8..c462d0cc883 100644 --- a/storage/sphinx/mysql-test/sphinx/sphinx.result +++ b/storage/sphinx/mysql-test/sphinx/sphinx.result @@ -75,3 +75,23 @@ id w q 1 2 test;range=meta.foo_count,100,500 5 1 test;range=meta.foo_count,100,500 drop table ts; +# +# MDEV-19205: Sphinx unable to connect using a host name +# +create table ts ( id bigint unsigned not null, w int not null, q varchar(255) not null, index(q) ) engine=sphinx connection="sphinx://localhost:SPHINXSEARCH_PORT/*"; +select * from ts where q=';filter=meta.foo_count,100'; +id w q +1 1 ;filter=meta.foo_count,100 +select * from ts where q='test;filter=meta.sub.int,7'; +id w q +5 1 test;filter=meta.sub.int,7 +select * from ts where q=';filter=meta.sub.list[0],4'; +id w q +select * from ts where q=';filter=meta.sub.list[1],4'; +id w q +5 1 ;filter=meta.sub.list[1],4 +select * from ts where q='test;range=meta.foo_count,100,500'; +id w q +1 2 test;range=meta.foo_count,100,500 +5 1 test;range=meta.foo_count,100,500 +drop table ts; diff --git a/storage/sphinx/mysql-test/sphinx/sphinx.test b/storage/sphinx/mysql-test/sphinx/sphinx.test index fe388f7ddd2..b733a3fc5ff 100644 --- a/storage/sphinx/mysql-test/sphinx/sphinx.test +++ b/storage/sphinx/mysql-test/sphinx/sphinx.test @@ -41,3 +41,16 @@ select * from ts where q=';filter=meta.sub.list[0],4'; select * from ts where q=';filter=meta.sub.list[1],4'; select * from ts where q='test;range=meta.foo_count,100,500'; drop table ts; + +--echo # +--echo # MDEV-19205: Sphinx unable to connect using a host name +--echo # + +--replace_result $SPHINXSEARCH_PORT SPHINXSEARCH_PORT +eval create table ts ( id bigint unsigned not null, w int not null, q varchar(255) not null, index(q) ) engine=sphinx connection="sphinx://localhost:$SPHINXSEARCH_PORT/*"; +select * from ts where q=';filter=meta.foo_count,100'; +select * from ts where q='test;filter=meta.sub.int,7'; +select * from ts where q=';filter=meta.sub.list[0],4'; +select * from ts where q=';filter=meta.sub.list[1],4'; +select * from ts where q='test;range=meta.foo_count,100,500'; +drop table ts; -- cgit v1.2.1