summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com>2005-05-07 15:48:56 +0500
committerunknown <svoj@mysql.com>2005-05-07 15:48:56 +0500
commit1392f4820aba16e2349a46962d8b7c7cddadd800 (patch)
treef713be1c364ea77bd416044efc9bd42ed9a007e5 /sql/item_func.cc
parent079910b6f1bc7cbb1a9425bf0e49775e4c41d365 (diff)
downloadmariadb-git-1392f4820aba16e2349a46962d8b7c7cddadd800.tar.gz
BUG#7709 fix - Boolean fulltext query against unsupported engines does not
fail. mysql-test/r/innodb.result: Test case for BUG#7709 - Boolean fulltext query against unsupported engines does not fail added. mysql-test/t/innodb.test: Test case for BUG#7709 - Boolean fulltext query against unsupported engines does not fail added. sql/item_func.cc: Check if table supports fulltext. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 334be48dc9a..855e86b2382 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2257,6 +2257,11 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist)
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)