bk commit into 5.0 tree (svoj:1.2440)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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@stripped, 2007-04-18 12:39:04+05:00, svoj@stripped +3 -0
  Merge mysql.com:/home/svoj/devel/mysql/BUG25951/mysql-4.1-engines
  into  mysql.com:/home/svoj/devel/mysql/BUG25951/mysql-5.0-engines
  MERGE: 1.1616.3010.1

  mysql-test/r/fulltext.result@stripped, 2007-04-18 12:39:02+05:00, svoj@stripped +1 -1
    Manual merge.
    MERGE: 1.65.1.14

  mysql-test/t/fulltext.test@stripped, 2007-04-18 12:39:02+05:00, svoj@stripped +2 -2
    Manual merge.
    MERGE: 1.71.1.7

  sql/item_func.cc@stripped, 2007-04-18 12:39:02+05:00, svoj@stripped +1 -1
    Manual merge.
    MERGE: 1.124.42.23

# 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:	svoj
# Host:	june.mysql.com
# Root:	/home/svoj/devel/mysql/BUG25951/mysql-5.0-engines/RESYNC

--- 1.333/sql/item_func.cc	2007-04-08 23:46:37 +05:00
+++ 1.334/sql/item_func.cc	2007-04-18 12:39:02 +05:00
@@ -4734,7 +4734,7 @@ bool Item_func_match::fix_index()
   for (keynr=0 ; keynr < table->s->keys ; keynr++)
   {
     if ((table->key_info[keynr].flags & HA_FULLTEXT) &&
-        (table->keys_in_use_for_query.is_set(keynr)))
+        (table->s->keys_in_use.is_set(keynr)))
     {
       ft_to_key[fts]=keynr;
       ft_cnt[fts]=0;

--- 1.86/mysql-test/r/fulltext.result	2006-10-30 10:13:58 +04:00
+++ 1.87/mysql-test/r/fulltext.result	2007-04-18 12:39:02 +05:00
@@ -456,3 +456,10 @@ a	FORMAT(MATCH(a) AGAINST('test1 test'),
 test1	0.685267
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
+CREATE TABLE t1 (a VARCHAR(255), FULLTEXT(a));
+SELECT * FROM t1 IGNORE INDEX(a) WHERE MATCH(a) AGAINST('test');
+a
+ALTER TABLE t1 DISABLE KEYS;
+SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');
+ERROR HY000: Can't find FULLTEXT index matching the column list
+DROP TABLE t1;

--- 1.81/mysql-test/t/fulltext.test	2006-03-22 17:57:20 +04:00
+++ 1.82/mysql-test/t/fulltext.test	2007-04-18 12:39:02 +05:00
@@ -377,4 +377,14 @@ EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
 
+#
+# BUG#25951 - ignore/use index does not work with fulltext
+#
+CREATE TABLE t1 (a VARCHAR(255), FULLTEXT(a));
+SELECT * FROM t1 IGNORE INDEX(a) WHERE MATCH(a) AGAINST('test');
+ALTER TABLE t1 DISABLE KEYS;
+--error 1191
+SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');
+DROP TABLE t1;
+
 # End of 4.1 tests