diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-12-30 17:10:54 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-12-30 17:10:54 +0200 |
| commit | f0be022cf01b5978534614a8e9c33db0224298c9 (patch) | |
| tree | 37a9070267d59b595a4a584136f46c1e30e29981 /storage/sphinx | |
| parent | de0907648639777fe671eb33495089549b49291a (diff) | |
| download | mariadb-git-f0be022cf01b5978534614a8e9c33db0224298c9.tar.gz | |
MDEV-5539 Empty results in UNION with Sphinx engine
The bug was fixed by Serg earlier by including Sphinx 2.2.6, but he forgot to update the test case.
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/mysql-test/sphinx/union-5539.result | 4 | ||||
| -rw-r--r-- | storage/sphinx/mysql-test/sphinx/union-5539.test | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/storage/sphinx/mysql-test/sphinx/union-5539.result b/storage/sphinx/mysql-test/sphinx/union-5539.result index 414bcce30e9..ab694b7db6a 100644 --- a/storage/sphinx/mysql-test/sphinx/union-5539.result +++ b/storage/sphinx/mysql-test/sphinx/union-5539.result @@ -1,6 +1,10 @@ create table ts (id bigint unsigned not null, w int not null, query varchar(255) not null, index(query)) engine=sphinx connection="sphinx://127.0.0.1:PORT/*"; SELECT a.* FROM (SELECT * FROM ts si WHERE si.query=';mode=extended2;limit=1000000;maxmatches=500') AS a UNION SELECT b.* FROM (SELECT * FROM ts si WHERE si.query='@* 123nothingtofind123;mode=extended2;limit=1000000;maxmatches=500') AS b; id w query +1 1 ;mode=extended2;limit=1000000;maxmatches=500 +2 1 ;mode=extended2;limit=1000000;maxmatches=500 +3 1 ;mode=extended2;limit=1000000;maxmatches=500 +4 1 ;mode=extended2;limit=1000000;maxmatches=500 SELECT a.* FROM (SELECT * FROM ts si WHERE si.query='@* 123nothingtofind123;mode=extended2;limit=1000000;maxmatches=500') AS a UNION SELECT b.* FROM (SELECT * FROM ts si WHERE si.query=';mode=extended2;limit=1000000;maxmatches=500') AS b; id w query 1 1 ;mode=extended2;limit=1000000;maxmatches=500 diff --git a/storage/sphinx/mysql-test/sphinx/union-5539.test b/storage/sphinx/mysql-test/sphinx/union-5539.test index ec73be1ab3e..94cc2c024fb 100644 --- a/storage/sphinx/mysql-test/sphinx/union-5539.test +++ b/storage/sphinx/mysql-test/sphinx/union-5539.test @@ -5,11 +5,6 @@ eval create table ts (id bigint unsigned not null, w int not null, query varchar(255) not null, index(query)) engine=sphinx connection="sphinx://127.0.0.1:$SPHINXSEARCH_PORT/*"; let $q1=SELECT * FROM ts si WHERE si.query=';mode=extended2;limit=1000000;maxmatches=500'; let $q2=SELECT * FROM ts si WHERE si.query='@* 123nothingtofind123;mode=extended2;limit=1000000;maxmatches=500'; -######################## -# BUG BUG BUG !!! -# Note, the result below is incorrect! It should be updated when -# MDEV-5539 is fixed upstream!!! -######################## eval SELECT a.* FROM ($q1) AS a UNION SELECT b.* FROM ($q2) AS b; eval SELECT a.* FROM ($q2) AS a UNION SELECT b.* FROM ($q1) AS b; drop table ts; |