mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-21 15:55:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse source 
into mysql.com:/home/svoj/devel/mysql/7709-mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
This commit is contained in:
unknown 2005-05-07 21:39:29 +05:00
commit d868738e11
4 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -143,6 +143,7 @@ serg@sergbook.mylan
serg@sergbook.mysql.com
sergefp@mysql.com
sinisa@rhols221.adsl.netsonic.fi
svoj@mysql.com
tfr@beta.frontier86.ee
tfr@indrek.tfr.cafe.ee
tfr@sarvik.tfr.cafe.ee

4
mysql-test/r/innodb.result
View file

@ -1272,3 +1272,7 @@ Cannot delete or update a parent row: a foreign key constraint fails
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
DROP TABLE t1;

10
mysql-test/t/innodb.test
View file

@ -911,3 +911,13 @@ delete from t1 where id=15;
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);
DROP TABLE t1;

5
sql/item_func.cc
View file

@ -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)