bk commit into 4.1 tree (serg:1.2091) BUG#6635

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.1 repository of serg. When serg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2091 05/03/08 19:45:55 serg@stripped +3 -0
  BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
  for fulltext searches too

  sql/sql_select.cc
    1.385 05/03/08 19:45:49 serg@stripped +1 -1
    BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
    for fulltext searches too

  mysql-test/t/fulltext_order_by.test
    1.15 05/03/08 19:45:48 serg@stripped +8 -0
    BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
    for fulltext searches too

  mysql-test/r/fulltext_order_by.result
    1.14 05/03/08 19:45:48 serg@stripped +8 -0
    BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
    for fulltext searches too

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.1

--- 1.384/sql/sql_select.cc	Tue Mar  1 11:19:30 2005
+++ 1.385/sql/sql_select.cc	Tue Mar  8 19:45:49 2005
@@ -7142,7 +7142,7 @@
   {
     ref_key=	   tab->ref.key;
     ref_key_parts= tab->ref.key_parts;
-    if (tab->type == JT_REF_OR_NULL)
+    if (tab->type == JT_REF_OR_NULL || tab->type == JT_FT)
       DBUG_RETURN(0);
   }
   else if (select && select->quick)		// Range found by opt_range

--- 1.13/mysql-test/r/fulltext_order_by.result	Wed Sep 15 20:47:24 2004
+++ 1.14/mysql-test/r/fulltext_order_by.result	Tue Mar  8 19:45:48 2005
@@ -62,6 +62,14 @@
 6	0
 4	1
 7	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
+1	SIMPLE	t1	fulltext	message	message	0		1	Using where; Using filesort
+SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message desc;
+message
+steve is cool
+steve
 drop table t1;
 CREATE TABLE t1 (
 a INT AUTO_INCREMENT PRIMARY KEY,

--- 1.14/mysql-test/t/fulltext_order_by.test	Wed Sep 15 20:47:24 2004
+++ 1.15/mysql-test/t/fulltext_order_by.test	Tue Mar  8 19:45:48 2005
@@ -31,6 +31,14 @@
 SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) as rel FROM t1 ORDER BY rel;
 SELECT a, 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
+# for fulltext searches too
+#
+alter table t1 add key m (message);
+explain SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message;
+SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message desc;
+
 drop table t1;
 
 #