Commit d868738e authored by unknown's avatar unknown
Browse files

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

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


BitKeeper/etc/logging_ok:
  auto-union
parents e584559f f5f132fd

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/r/innodb.result

+4 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/innodb.test

+10 −0
Original line number Diff line number Diff line
@@ -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;

sql/item_func.cc

+5 −0
Original line number Diff line number Diff line
@@ -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)