Continuation of the efforts in previous cset.

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

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