Merge mysql.com:/home/svoj/devel/mysql/BUG25951/mysql-4.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG25951/mysql-5.0-engines


mysql-test/r/fulltext.result:
  Manual merge.
mysql-test/t/fulltext.test:
  Manual merge.
sql/item_func.cc:
  Manual merge.

3 files changed, 18 insertions, 1 deletions

diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 7c9069791fa..f6efe2411c0 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -456,3 +456,10 @@ a	FORMAT(MATCH(a) AGAINST('test1 test'),6)
 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;
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 0f7835e9e7e..44375562307 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -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
diff --git a/sql/item_func.cc b/sql/item_func.cc
index c4279d1bd4e..503b4362e7a 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -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;