bk commit into 4.0 tree (svoj:1.2097) BUG#7709

[svoj]

Below is the list of changes that have just been committed into a local
4.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
  1.2097 05/05/07 15:48:56 svoj@stripped +4 -0
  BUG#7709 fix - Boolean fulltext query against unsupported engines does not
  fail.

  BitKeeper/etc/logging_ok
    1.334 05/05/07 15:48:56 svoj@stripped +1 -0
    Logging to logging@stripped accepted

  sql/item_func.cc
    1.112 05/05/07 15:48:42 svoj@stripped +5 -0
    Check if table supports fulltext.

  mysql-test/t/innodb.test
    1.56 05/05/07 15:48:42 svoj@stripped +9 -0
    Test case for BUG#7709 - Boolean fulltext query against
    unsupported engines does not fail added.

  mysql-test/r/innodb.result
    1.81 05/05/07 15:48:42 svoj@stripped +3 -0
    Test case for BUG#7709 - Boolean fulltext query against
    unsupported engines does not fail added.

# 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:	axe.(none)
# Root:	/home/svoj/devel/mysql/7709-mysql-4.0

--- 1.111/sql/item_func.cc	2004-08-24 18:29:05 +05:00
+++ 1.112/sql/item_func.cc	2005-05-07 15:48:42 +05:00
@@ -2257,6 +2257,11 @@
     key=NO_SUCH_KEY;
   const_item_cache=0;
   table=((Item_field *)fields.head())->field->table;
+  if (!(table->file->table_flags() & HA_CAN_FULLTEXT))
+  {
+    my_error(ER_TABLE_CANT_HANDLE_FULLTEXT, MYF(0));
+    return 1;
+  }
   table->fulltext_searched=1;
   record=table->record[0];
   if (key == NO_SUCH_KEY && mode != FT_BOOL)

--- 1.333/BitKeeper/etc/logging_ok	2005-05-06 18:42:27 +05:00
+++ 1.334/BitKeeper/etc/logging_ok	2005-05-07 15:48:56 +05:00
@@ -142,6 +142,7 @@
 serg@stripped
 sergefp@stripped
 sinisa@stripped
+svoj@stripped
 tfr@stripped
 tfr@stripped
 tfr@stripped

--- 1.80/mysql-test/r/innodb.result	2005-04-14 21:14:50 +05:00
+++ 1.81/mysql-test/r/innodb.result	2005-05-07 15:48:42 +05:00
@@ -1272,3 +1272,6 @@
 delete from t1 where id=15;
 delete from t1 where id=0;
 drop table t1;
+CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB;
+SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE);
+The used table type doesn't support FULLTEXT indexes

--- 1.55/mysql-test/t/innodb.test	2005-04-14 21:14:50 +05:00
+++ 1.56/mysql-test/t/innodb.test	2005-05-07 15:48:42 +05:00
@@ -911,3 +911,12 @@
 delete from t1 where id=0;
 
 drop table t1;
+
+#
+# BUG#7709 test case - Boolean fulltext query against unsupported 
+#                      engines does not fail
+#
+
+CREATE TABLE t1 ( a char(10) ) ENGINE=InnoDB;
+--error 1214;
+SELECT a FROM t1 WHERE MATCH (a) AGAINST ('test' IN BOOLEAN MODE);