diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2011-12-30 11:34:29 +0100 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2011-12-30 11:34:29 +0100 |
| commit | 0346e25f07266b6905f8bd5dbb664e32be3155fd (patch) | |
| tree | 306a5810de5a170e4752b5a2a44ab1c932378760 /mysql-test | |
| parent | d9fcec5acdbe5aa06428dfbb9b828ebef845e7ca (diff) | |
| download | mariadb-git-0346e25f07266b6905f8bd5dbb664e32be3155fd.tar.gz | |
Continuation of the efforts in previous cset.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/fulltext_order_by.result | 18 | ||||
| -rw-r--r-- | mysql-test/t/fulltext_order_by.test | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/mysql-test/r/fulltext_order_by.result b/mysql-test/r/fulltext_order_by.result index 9203f40ba6c..419c1f53a2c 100644 --- a/mysql-test/r/fulltext_order_by.result +++ b/mysql-test/r/fulltext_order_by.result @@ -53,15 +53,15 @@ other 0.000000 other 0.000000 steve-is-cool 0.895690 cool 0.905873 -SELECT IF(a=7,'steve-is-cool',IF(a=4,'cool', 'other')), MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) as rel FROM t1 ORDER BY rel; -IF(a=7,'steve-is-cool',IF(a=4,'cool', 'other')) rel -other 0 -other 0 -other 0 -other 0 -other 0 -steve-is-cool 1 -cool 1 +SELECT IF(a=7,'match',IF(a=4,'match', 'no-match')), MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) as rel FROM t1 ORDER BY rel; +IF(a=7,'match',IF(a=4,'match', 'no-match')) rel +no-match 0 +no-match 0 +no-match 0 +no-match 0 +no-match 0 +match 1 +match 1 alter table t1 add key m (message); explain SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message; id select_type table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/t/fulltext_order_by.test b/mysql-test/t/fulltext_order_by.test index 6a5c7eb1615..0f800e5c077 100644 --- a/mysql-test/t/fulltext_order_by.test +++ b/mysql-test/t/fulltext_order_by.test @@ -29,7 +29,7 @@ SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE a=7 an # ORDER BY MATCH SELECT IF(a=7,'steve-is-cool',IF(a=4,'cool', 'other')), FORMAT(MATCH (message) AGAINST ('steve'),6) as rel FROM t1 ORDER BY rel; -SELECT IF(a=7,'steve-is-cool',IF(a=4,'cool', 'other')), MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) as rel FROM t1 ORDER BY rel; +SELECT IF(a=7,'match',IF(a=4,'match', 'no-match')), MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) as rel FROM t1 ORDER BY rel; # # BUG#6635 - test_if_skip_sort_order() thought it can skip filesort |