[Commits] Rev 3819: simple changes to the test suite to make it working in file:///home/bell/maria/bzr/work-maria-10.0-serg/

sanja at montyprogram.com sanja at montyprogram.com
Wed Aug 7 13:38:25 EEST 2013


At file:///home/bell/maria/bzr/work-maria-10.0-serg/

------------------------------------------------------------
revno: 3819
revision-id: sanja at montyprogram.com-20130807103824-k3exhpz8l6bwgen9
parent: sanja at montyprogram.com-20130807095500-98xn92oua9tr8wn4
committer: sanja at montyprogram.com
branch nick: work-maria-10.0-serg
timestamp: Wed 2013-08-07 13:38:24 +0300
message:
  simple changes to the test suite to make it working
-------------- next part --------------
=== removed file 'mysql-test/suite/innodb_fts/r/fulltext.reject'
--- a/mysql-test/suite/innodb_fts/r/fulltext.reject	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext.reject	1970-01-01 00:00:00 +0000
@@ -1,642 +0,0 @@
-drop table if exists t1,t2,t3;
-CREATE TABLE t1 (a VARCHAR(200), b TEXT, FULLTEXT (a,b)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),
-('Full-text indexes', 'are called collections'),
-('Only MyISAM tables','support collections'),
-('Function MATCH ... AGAINST()','is used to do a search'),
-('Full-text search in MySQL', 'implements vector space model');
-ANALYZE TABLE t1;
-SHOW INDEX FROM t1;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t1	1	a	1	a	NULL	5	NULL	NULL	YES	FULLTEXT		
-t1	1	a	2	b	NULL	5	NULL	NULL	YES	FULLTEXT		
-select * from t1 where MATCH(a,b) AGAINST ("collections");
-a	b
-Full-text indexes	are called collections
-Only MyISAM tables	support collections
-explain extended select * from t1 where MATCH(a,b) AGAINST ("collections");
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	100.00	Using where
-Warnings:
-Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (match `test`.`t1`.`a`,`test`.`t1`.`b` against ('collections'))
-select * from t1 where MATCH(a,b) AGAINST ("indexes");
-a	b
-Full-text indexes	are called collections
-select * from t1 where MATCH(a,b) AGAINST ("indexes collections");
-a	b
-Full-text indexes	are called collections
-Only MyISAM tables	support collections
-select * from t1 where MATCH(a,b) AGAINST ("only");
-a	b
-Only MyISAM tables	support collections
-select * from t1 where MATCH(a,b) AGAINST ("collections" WITH QUERY EXPANSION);
-a	b
-Only MyISAM tables	support collections
-Full-text indexes	are called collections
-MySQL has now support	for full-text search
-Full-text search in MySQL	implements vector space model
-select * from t1 where MATCH(a,b) AGAINST ("indexes" WITH QUERY EXPANSION);
-a	b
-Full-text indexes	are called collections
-Only MyISAM tables	support collections
-MySQL has now support	for full-text search
-Full-text search in MySQL	implements vector space model
-select * from t1 where MATCH(a,b) AGAINST ("indexes collections" WITH QUERY EXPANSION);
-a	b
-Only MyISAM tables	support collections
-Full-text indexes	are called collections
-MySQL has now support	for full-text search
-Full-text search in MySQL	implements vector space model
-select * from t1 where MATCH(a,b) AGAINST ("indexes" IN NATURAL LANGUAGE MODE);
-a	b
-Full-text indexes	are called collections
-select * from t1 where MATCH(a,b) AGAINST ("indexes" IN NATURAL LANGUAGE MODE WITH QUERY EXPANSION);
-a	b
-Full-text indexes	are called collections
-Only MyISAM tables	support collections
-MySQL has now support	for full-text search
-Full-text search in MySQL	implements vector space model
-select * from t1 where MATCH(a,b) AGAINST ("indexes" IN BOOLEAN MODE WITH QUERY EXPANSION);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'QUERY EXPANSION)' at line 1
-explain select * from t1 where MATCH(a,b) AGAINST ("collections");
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
-explain select * from t1 where MATCH(a,b) AGAINST ("collections")>0;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
-explain select * from t1 where MATCH(a,b) AGAINST ("collections")>1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
-explain select * from t1 where MATCH(a,b) AGAINST ("collections")>=0;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	Using where
-explain select * from t1 where MATCH(a,b) AGAINST ("collections")>=1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
-explain select * from t1 where 0<MATCH(a,b) AGAINST ("collections");
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
-explain select * from t1 where 1<MATCH(a,b) AGAINST ("collections");
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
-explain select * from t1 where 0<=MATCH(a,b) AGAINST ("collections");
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	Using where
-explain select * from t1 where 1<=MATCH(a,b) AGAINST ("collections");
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
-explain select * from t1 where MATCH(a,b) AGAINST ("collections")>0 and a like '%ll%';
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
-select * from t1 where MATCH(a,b) AGAINST("support -collections" IN BOOLEAN MODE);
-a	b
-MySQL has now support	for full-text search
-explain extended select * from t1 where MATCH(a,b) AGAINST("support -collections" IN BOOLEAN MODE);
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	100.00	Using where
-Warnings:
-Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (match `test`.`t1`.`a`,`test`.`t1`.`b` against ('support -collections' in boolean mode))
-select * from t1 where MATCH(a,b) AGAINST("support  collections" IN BOOLEAN MODE);
-a	b
-Only MyISAM tables	support collections
-MySQL has now support	for full-text search
-Full-text indexes	are called collections
-select * from t1 where MATCH(a,b) AGAINST("support +collections" IN BOOLEAN MODE);
-a	b
-Only MyISAM tables	support collections
-Full-text indexes	are called collections
-select * from t1 where MATCH(a,b) AGAINST("sear*" IN BOOLEAN MODE);
-a	b
-MySQL has now support	for full-text search
-Function MATCH ... AGAINST()	is used to do a search
-Full-text search in MySQL	implements vector space model
-select * from t1 where MATCH(a,b) AGAINST("+support +collections" IN BOOLEAN MODE);
-a	b
-Only MyISAM tables	support collections
-select * from t1 where MATCH(a,b) AGAINST("+search" IN BOOLEAN MODE);
-a	b
-MySQL has now support	for full-text search
-Function MATCH ... AGAINST()	is used to do a search
-Full-text search in MySQL	implements vector space model
-select * from t1 where MATCH(a,b) AGAINST("+search +(support vector)" IN BOOLEAN MODE);
-a	b
-MySQL has now support	for full-text search
-Full-text search in MySQL	implements vector space model
-select * from t1 where MATCH(a,b) AGAINST("+search -(support vector)" IN BOOLEAN MODE);
-a	b
-Function MATCH ... AGAINST()	is used to do a search
-select *, MATCH(a,b) AGAINST("support collections" IN BOOLEAN MODE) as x from t1;
-a	b	x
-MySQL has now support	for full-text search	0.15835624933242798
-Full-text indexes	are called collections	0.15835624933242798
-Only MyISAM tables	support collections	0.31671249866485596
-Function MATCH ... AGAINST()	is used to do a search	0
-Full-text search in MySQL	implements vector space model	0
-select *, MATCH(a,b) AGAINST("collections support" IN BOOLEAN MODE) as x from t1;
-a	b	x
-MySQL has now support	for full-text search	0.15835624933242798
-Full-text indexes	are called collections	0.15835624933242798
-Only MyISAM tables	support collections	0.31671249866485596
-Function MATCH ... AGAINST()	is used to do a search	0
-Full-text search in MySQL	implements vector space model	0
-select * from t1 where MATCH a,b AGAINST ("+call* +coll*" IN BOOLEAN MODE);
-a	b
-Full-text indexes	are called collections
-select * from t1 where MATCH a,b AGAINST ('"support now"' IN BOOLEAN MODE);
-a	b
-select * from t1 where MATCH a,b AGAINST ('"Now sUPPort"' IN BOOLEAN MODE);
-a	b
-MySQL has now support	for full-text search
-select * from t1 where MATCH a,b AGAINST ('"now   support"' IN BOOLEAN MODE);
-a	b
-MySQL has now support	for full-text search
-select * from t1 where MATCH a,b AGAINST ('"text search"  "now support"' IN BOOLEAN MODE);
-a	b
-MySQL has now support	for full-text search
-Full-text search in MySQL	implements vector space model
-select * from t1 where MATCH a,b AGAINST ('"text search" -"now support"' IN BOOLEAN MODE);
-a	b
-Full-text search in MySQL	implements vector space model
-select * from t1 where MATCH a,b AGAINST ('"text search" +"now support"' IN BOOLEAN MODE);
-a	b
-MySQL has now support	for full-text search
-select * from t1 where MATCH a,b AGAINST ('"text i"' IN BOOLEAN MODE);
-a	b
-select * from t1 where MATCH a,b AGAINST ('"xt indexes"' IN BOOLEAN MODE);
-a	b
-select * from t1 where MATCH a,b AGAINST ('+(support collections) +foobar*' IN BOOLEAN MODE);
-a	b
-select * from t1 where MATCH a,b AGAINST ('+(+(support collections)) +foobar*' IN BOOLEAN MODE);
-a	b
-select * from t1 where MATCH a,b AGAINST ('+collections -supp* -foobar*' IN BOOLEAN MODE);
-a	b
-Full-text indexes	are called collections
-select * from t1 where MATCH a,b AGAINST('"space model' IN BOOLEAN MODE);
-a	b
-Full-text search in MySQL	implements vector space model
-delete from t1 where a like "MySQL%";
-update t1 set a='some test foobar' where MATCH a,b AGAINST ('model');
-delete from t1 where MATCH(a,b) AGAINST ("indexes");
-select * from t1;
-a	b
-Only MyISAM tables	support collections
-Function MATCH ... AGAINST()	is used to do a search
-some test foobar	implements vector space model
-drop table t1;
-create table t1 (a varchar(200) not null, fulltext (a)) engine = innodb;
-insert t1 values ("aaa10 bbb20"), ("aaa20 bbb15"), ("aaa30 bbb10");
-select * from t1 where match a against ("+aaa* +bbb*" in boolean mode);
-a
-aaa10 bbb20
-aaa20 bbb15
-aaa30 bbb10
-select * from t1 where match a against ("+aaa* +bbb1*" in boolean mode);
-a
-aaa20 bbb15
-aaa30 bbb10
-select * from t1 where match a against ("+aaa* +ccc*" in boolean mode);
-a
-select * from t1 where match a against ("+aaa10 +(bbb*)" in boolean mode);
-a
-aaa10 bbb20
-select * from t1 where match a against ("+(+aaa* +bbb1*)" in boolean mode);
-a
-select * from t1 where match a against ("(+aaa* +bbb1*)" in boolean mode);
-a
-aaa20 bbb15
-aaa30 bbb10
-drop table t1;
-CREATE TABLE t1 (
-id int(11),
-ticket int(11),
-KEY ti (id),
-KEY tit (ticket)
-) ENGINE = InnoDB;
-INSERT INTO t1 VALUES (2,3),(1,2);
-CREATE TABLE t2 (
-ticket int(11),
-inhalt text,
-KEY tig (ticket),
-fulltext index tix (inhalt)
-) ENGINE = InnoDB;
-INSERT INTO t2 VALUES (1,'foo'),(2,'bar'),(3,'foobar');
-INSERT INTO t1 VALUES (3,3);
-ANALYZE TABLE t1;
-ANALYZE TABLE t2;
-select ticket2.id FROM t2 as ttxt,t2
-INNER JOIN t1 as ticket2 ON ticket2.id = t2.ticket
-WHERE ticket2.id = ticket2.ticket and
-match(ttxt.inhalt) against ('foobar');
-id
-3
-show keys from t2;
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
-t2	1	tig	1	ticket	A	3	NULL	NULL	YES	BTREE		
-t2	1	tix	1	inhalt	NULL	3	NULL	NULL	YES	FULLTEXT		
-show create table t2;
-Table	Create Table
-t2	CREATE TABLE `t2` (
-  `ticket` int(11) DEFAULT NULL,
-  `inhalt` text,
-  KEY `tig` (`ticket`),
-  FULLTEXT KEY `tix` (`inhalt`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
-select * from t2 where MATCH inhalt AGAINST (NULL);
-ticket	inhalt
-select * from t2 where  MATCH inhalt AGAINST ('foobar');
-ticket	inhalt
-3	foobar
-select * from t2 having MATCH inhalt AGAINST ('foobar');
-ticket	inhalt
-3	foobar
-CREATE TABLE t3 (t int(11),i text,fulltext tix (t,i));
-ERROR HY000: Column 't' cannot be part of FULLTEXT index
-CREATE TABLE t3 (t int(11),i text,
-j varchar(200) CHARACTER SET latin2,
-fulltext tix (i,j));
-ERROR HY000: Column 'j' cannot be part of FULLTEXT index
-CREATE TABLE t3 (
-ticket int(11),
-inhalt text,
-KEY tig (ticket),
-fulltext index tix (inhalt)
-) ENGINE = InnoDB;
-select * from t2 where MATCH inhalt AGAINST (t2.inhalt);
-ERROR HY000: Incorrect arguments to AGAINST
-select * from t2 where MATCH ticket AGAINST ('foobar');
-ERROR HY000: Can't find FULLTEXT index matching the column list
-select * from t2,t3 where MATCH (t2.inhalt,t3.inhalt) AGAINST ('foobar');
-ERROR HY000: Incorrect arguments to MATCH
-drop table t1,t2,t3;
-CREATE TABLE t1 (
-id int(11)  auto_increment,
-title varchar(100)  default '',
-PRIMARY KEY  (id),
-KEY ind5 (title)
-) ENGINE = InnoDB;
-CREATE FULLTEXT INDEX ft1 ON t1(title);
-Warnings:
-Warning	124	InnoDB rebuilding table to add column FTS_DOC_ID
-insert into t1 (title) values ('this is a test');
-select * from t1 where match title against ('test' in boolean mode);
-id	title
-1	this is a test
-update t1 set title='this is A test' where id=1;
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-update t1 set title='this test once revealed a bug' where id=1;
-select * from t1;
-id	title
-1	this test once revealed a bug
-update t1 set title=NULL where id=1;
-drop table t1;
-CREATE TABLE t1 (a int(11), b text, FULLTEXT KEY (b)) ENGINE = InnoDB;
-insert into t1 values (1,"I wonder why the fulltext index doesnt work?");
-SELECT * from t1 where MATCH (b) AGAINST ('apples');
-a	b
-insert into t1 values (2,"fullaaa fullzzz");
-select * from t1 where match b against ('full*' in boolean mode);
-a	b
-1	I wonder why the fulltext index doesnt work?
-2	fullaaa fullzzz
-drop table t1;
-CREATE TABLE t1 ( id int(11) NOT NULL auto_increment primary key, mytext text NOT NULL, FULLTEXT KEY mytext (mytext)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES (1,'my small mouse'),(2,'la-la-la'),(3,'It is so funny'),(4,'MySQL Tutorial');
-select 8 from t1;
-8
-8
-8
-8
-8
-drop table t1;
-create table t1 (a text, fulltext key (a)) ENGINE = InnoDB;
-insert into t1 values ('aaaa');
-select * from t1 where match (a) against ('aaaa');
-a
-aaaa
-drop table t1;
-create table t1 ( ref_mag text not null, fulltext (ref_mag)) ENGINE = InnoDB;
-insert into t1 values ('test');
-select ref_mag from t1 where match ref_mag against ('+test' in boolean mode);
-ref_mag
-test
-alter table t1 change ref_mag ref_mag char (255) not null;
-select ref_mag from t1 where match ref_mag against ('+test' in boolean mode);
-ref_mag
-test
-drop table t1;
-create table t1 (t1_id int(11) primary key, name varchar(32)) ENGINE = InnoDB;
-insert into t1 values (1, 'data1');
-insert into t1 values (2, 'data2');
-create table t2 (t2_id int(11) primary key, t1_id int(11), name varchar(32)) ENGINE = InnoDB;
-insert into t2 values (1, 1, 'xxfoo');
-insert into t2 values (2, 1, 'xxbar');
-insert into t2 values (3, 1, 'xxbuz');
-select * from t1 join t2 using(`t1_id`) where match (t1.name, t2.name) against('xxfoo' in boolean mode);
-ERROR HY000: The table does not have FULLTEXT index to support this query
-select * from t2 where match name against ('*a*b*c*d*e*f*' in boolean mode);
-ERROR HY000: The table does not have FULLTEXT index to support this query
-drop table t1,t2;
-create table t1 (a text, fulltext key (a)) ENGINE = InnoDB;
-insert into t1 select "xxxx yyyy zzzz";
-drop table t1;
-SET NAMES latin1;
-CREATE TABLE t1 (t text character set utf8 not null, fulltext(t)) ENGINE = InnoDB;
-INSERT t1 VALUES ('Mit freundlichem Gr��'), ('aus Osnabr�ck');
-SET NAMES koi8r;
-INSERT t1 VALUES ("��� �� - ������"),("������, �����!"),
-("�� ������, �����!"),("� ����� ����!");
-SELECT t, collation(t) FROM t1 WHERE MATCH t AGAINST ('������');
-t	collation(t)
-��� �� - ������	utf8_general_ci
-DROP TABLE t1;
-CREATE TABLE t1 (s varchar(255), FULLTEXT (s)) ENGINE = InnoDB DEFAULT CHARSET=utf8;
-insert into t1 (s) values ('p�ra para para'),('para para para');
-select * from t1 where match(s) against('para' in boolean mode);
-s
-para para para
-p�ra para para
-select * from t1 where match(s) against('par*' in boolean mode);
-s
-para para para
-p�ra para para
-DROP TABLE t1;
-CREATE TABLE t1 (h text, FULLTEXT (h)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES ('Jesses Hasse Ling and his syncopators of Swing');
-select count(*) from t1;
-count(*)
-1
-drop table t1;
-CREATE TABLE t1 ( a TEXT, FULLTEXT (a) ) ENGINE = InnoDB;
-INSERT INTO t1 VALUES ('testing ft_nlq_find_relevance');
-SELECT MATCH(a) AGAINST ('nosuchword') FROM t1;
-MATCH(a) AGAINST ('nosuchword')
-0
-DROP TABLE t1;
-create table t1 (a int primary key, b text, fulltext(b)) ENGINE = InnoDB;
-create table t2 (a int, b text) ENGINE = InnoDB;
-insert t1 values (1, "aaaa"), (2, "bbbb");
-insert t2 values (10, "aaaa"), (2, "cccc");
-replace t1 select * from t2;
-drop table t1, t2;
-CREATE TABLE t1 (t VARCHAR(200) CHARACTER SET utf8 COLLATE utf8_unicode_ci, FULLTEXT (t)) ENGINE = InnoDB;
-SET NAMES latin1;
-INSERT INTO t1 VALUES('Mit freundlichem Gr�� aus Osnabr�ck');
-SELECT COUNT(*) FROM t1 WHERE MATCH(t) AGAINST ('"osnabr�ck"' IN BOOLEAN MODE);
-COUNT(*)
-1
-DROP TABLE t1;
-CREATE TABLE t1 (a VARCHAR(30), FULLTEXT(a)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES('bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb');
-INSERT INTO t1 VALUES('testword\'\'');
-SELECT a FROM t1 WHERE MATCH a AGAINST('testword' IN BOOLEAN MODE);
-a
-testword''
-SELECT a FROM t1 WHERE MATCH a AGAINST('testword\'\'' IN BOOLEAN MODE);
-a
-INSERT INTO t1 VALUES('test\'s');
-SELECT a FROM t1 WHERE MATCH a AGAINST('test' IN BOOLEAN MODE);
-a
-test's
-DROP TABLE t1;
-CREATE TABLE t1 (a VARCHAR(10000), FULLTEXT(a)) ENGINE = InnoDB;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` varchar(10000) DEFAULT NULL,
-  FULLTEXT KEY `a` (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
-DROP TABLE t1;
-CREATE TABLE t1 (a TEXT, FULLTEXT KEY(a)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES('test'),('test1'),('test');
-ANALYZE TABLE t1;
-PREPARE stmt from "SELECT a, FORMAT(MATCH(a) AGAINST('test1 test'),6) FROM t1 WHERE MATCH(a) AGAINST('test1 test')";
-EXECUTE stmt;
-a	FORMAT(MATCH(a) AGAINST('test1 test'),6)
-test1	0.227645
-test	0.031008
-test	0.031008
-EXECUTE stmt;
-a	FORMAT(MATCH(a) AGAINST('test1 test'),6)
-test1	0.227645
-test	0.031008
-test	0.031008
-DEALLOCATE PREPARE stmt;
-DROP TABLE t1;
-CREATE TABLE t1 (a VARCHAR(255), FULLTEXT(a)) ENGINE = InnoDB;
-SELECT * FROM t1 IGNORE INDEX(a) WHERE MATCH(a) AGAINST('test');
-a
-SELECT * FROM t1 WHERE MATCH(a) AGAINST('test');
-a
-DROP TABLE t1;
-CREATE TABLE t1(a TEXT, fulltext(a)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES(' aaaaa aaaa');
-SELECT * FROM t1 WHERE MATCH(a) AGAINST ('"aaaa"' IN BOOLEAN MODE);
-a
- aaaaa aaaa
-DROP TABLE t1;
-CREATE TABLE t1(a VARCHAR(20), FULLTEXT(a)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES('Offside'),('City Of God');
-SELECT a FROM t1 WHERE MATCH a AGAINST ('+city of*' IN BOOLEAN MODE);
-a
-Offside
-City Of God
-SELECT a FROM t1 WHERE MATCH a AGAINST ('+city (of*)' IN BOOLEAN MODE);
-a
-Offside
-City Of God
-SELECT a FROM t1 WHERE MATCH a AGAINST ('+city* of*' IN BOOLEAN MODE);
-a
-Offside
-City Of God
-DROP TABLE t1;
-create table t1(a text,b date,fulltext index(a)) ENGINE = InnoDB;
-insert into t1 set a='water',b='2008-08-04';
-select 1 from t1 where match(a) against ('water' in boolean mode) and b>='2008-08-01';
-1
-1
-drop table t1;
-show warnings;
-Level	Code	Message
-CREATE TABLE t1 (a VARCHAR(255), b INT, FULLTEXT(a), KEY(b)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES('test', 1),('test', 1),('test', 1),('test', 1),
-('test', 1),('test', 2),('test', 3),('test', 4);
-ANALYZE TABLE t1;
-EXPLAIN SELECT * FROM t1
-WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	b,a	a	0		1	Using where
-EXPLAIN SELECT * FROM t1 USE INDEX(a)
-WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
-EXPLAIN SELECT * FROM t1 FORCE INDEX(a)
-WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0		1	Using where
-EXPLAIN SELECT * FROM t1 IGNORE INDEX(a)
-WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	b	NULL	NULL	NULL	8	Using where
-EXPLAIN SELECT * FROM t1 USE INDEX(b)
-WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	b	NULL	NULL	NULL	8	Using where
-EXPLAIN SELECT * FROM t1 FORCE INDEX(b)
-WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ref	b	b	5	const	5	Using where
-DROP TABLE t1;
-CREATE TABLE t1(a CHAR(10), fulltext(a)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES('aaa15');
-SELECT MATCH(a) AGAINST('aaa1* aaa14 aaa16' IN BOOLEAN MODE) FROM t1;
-MATCH(a) AGAINST('aaa1* aaa14 aaa16' IN BOOLEAN MODE)
-0.000000001885928302414186
-SELECT MATCH(a) AGAINST('aaa1* aaa14 aaa15 aaa16' IN BOOLEAN MODE) FROM t1;
-MATCH(a) AGAINST('aaa1* aaa14 aaa15 aaa16' IN BOOLEAN MODE)
-0.000000003771856604828372
-DROP TABLE t1;
-CREATE TABLE t1(a TEXT) ENGINE = InnoDB;
-SELECT GROUP_CONCAT(a) AS st FROM t1 HAVING MATCH(st) AGAINST('test' IN BOOLEAN MODE);
-ERROR HY000: Incorrect arguments to AGAINST
-DROP TABLE t1;
-CREATE TABLE t1(a VARCHAR(64), FULLTEXT(a)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES('awrd bwrd cwrd'),('awrd bwrd cwrd'),('awrd bwrd cwrd');
-SELECT * FROM t1 WHERE MATCH(a) AGAINST('+awrd bwrd* +cwrd*' IN BOOLEAN MODE);
-a
-awrd bwrd cwrd
-awrd bwrd cwrd
-awrd bwrd cwrd
-DROP TABLE t1;
-CREATE TABLE t1 (col text, FULLTEXT KEY full_text (col)) ENGINE = InnoDB;
-PREPARE s FROM 
-"SELECT MATCH (col) AGAINST('findme') FROM t1 ORDER BY MATCH (col) AGAINST('findme')"
-  ;
-EXECUTE s;
-MATCH (col) AGAINST('findme')
-DEALLOCATE PREPARE s;
-DROP TABLE t1;
-#
-# Bug #49250 : spatial btree index corruption and crash
-# Part two : fulltext syntax check
-#
-CREATE TABLE t1(col1 TEXT,
-FULLTEXT INDEX USING BTREE (col1));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE (col1))' at line 2
-CREATE TABLE t2(col1 TEXT) ENGINE = InnoDB;
-CREATE FULLTEXT INDEX USING BTREE ON t2(col);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE ON t2(col)' at line 1
-ALTER TABLE t2 ADD FULLTEXT INDEX USING BTREE (col1);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE (col1)' at line 1
-DROP TABLE t2;
-End of 5.0 tests
-#
-# Bug #47930: MATCH IN BOOLEAN MODE returns too many results 
-#  inside subquery
-#
-CREATE TABLE t1 (a int) ENGINE = InnoDB;
-INSERT INTO t1 VALUES (1), (2);
-CREATE TABLE t2 (a int, b2 char(10), FULLTEXT KEY b2 (b2)) ENGINE = InnoDB;
-INSERT INTO t2 VALUES (1,'Scargill');
-CREATE TABLE t3 (a int, b int) ENGINE = InnoDB;
-INSERT INTO t3 VALUES (1,1), (2,1);
-# t2 should use full text index
-EXPLAIN
-SELECT count(*) FROM t1 WHERE 
-not exists(
-SELECT 1 FROM t2, t3
-WHERE t3.a=t1.a AND MATCH(b2) AGAINST('scargill' IN BOOLEAN MODE)
-);
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
-2	DEPENDENT SUBQUERY	t2	fulltext	b2	b2	0		1	Using where
-2	DEPENDENT SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	2	Using where
-# should return 0
-SELECT count(*) FROM t1 WHERE 
-not exists(
-SELECT 1 FROM t2, t3
-WHERE t3.a=t1.a AND MATCH(b2) AGAINST('scargill' IN BOOLEAN MODE)
-);
-count(*)
-1
-# should return 0
-SELECT count(*) FROM t1 WHERE 
-not exists(
-SELECT 1 FROM t2 IGNORE INDEX (b2), t3
-WHERE t3.a=t1.a AND MATCH(b2) AGAINST('scargill' IN BOOLEAN MODE)
-);
-count(*)
-0
-DROP TABLE t1,t2,t3;
-CREATE TABLE t1 (a VARCHAR(4), FULLTEXT(a)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),
-('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('cwrd'),('awrd'),('cwrd'),
-('awrd');
-SELECT COUNT(*) FROM t1 WHERE MATCH(a) AGAINST("+awrd bwrd* +cwrd*" IN BOOLEAN MODE);
-COUNT(*)
-0
-DROP TABLE t1;
-#
-# Bug #49445: Assertion failed: 0, file .\item_row.cc, line 55 with 
-#   fulltext search and row op
-#
-CREATE TABLE t1(a CHAR(1),FULLTEXT(a)) ENGINE = InnoDB;
-SELECT 1 FROM t1 WHERE MATCH(a) AGAINST ('') AND ROW(a,a) > ROW(1,1);
-1
-DROP TABLE t1;
-#
-# BUG#51866 - crash with repair by sort and fulltext keys
-#
-CREATE TABLE t1(a CHAR(4), FULLTEXT(a)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES('aaaa');
-DROP TABLE t1;
-#
-# Bug#54484 explain + prepared statement: crash and Got error -1 from storage engine
-#
-CREATE TABLE t1(f1 VARCHAR(6) NOT NULL, FULLTEXT KEY(f1), UNIQUE(f1)) ENGINE = InnoDB;
-INSERT INTO t1 VALUES ('test');
-SELECT 1 FROM t1 WHERE 1 >
-ALL((SELECT 1 FROM t1 JOIN t1 a
-ON (MATCH(t1.f1) against (""))
-WHERE t1.f1 GROUP BY t1.f1)) xor f1;
-1
-1
-PREPARE stmt FROM
-'SELECT 1 FROM t1 WHERE 1 >
- ALL((SELECT 1 FROM t1 RIGHT OUTER JOIN t1 a
- ON (MATCH(t1.f1) against (""))
- WHERE t1.f1 GROUP BY t1.f1)) xor f1';
-EXECUTE stmt;
-1
-1
-EXECUTE stmt;
-1
-1
-DEALLOCATE PREPARE stmt;
-PREPARE stmt FROM
-'SELECT 1 FROM t1 WHERE 1 >
- ALL((SELECT 1 FROM t1 JOIN t1 a
- ON (MATCH(t1.f1) against (""))
- WHERE t1.f1 GROUP BY t1.f1))';
-EXECUTE stmt;
-1
-1
-EXECUTE stmt;
-1
-1
-DEALLOCATE PREPARE stmt;
-DROP TABLE t1;
-End of 5.1 tests

=== modified file 'mysql-test/suite/innodb_fts/r/fulltext.result'
--- a/mysql-test/suite/innodb_fts/r/fulltext.result	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext.result	2013-08-07 10:38:24 +0000
@@ -16,9 +16,9 @@ Full-text indexes	are called collections
 Only MyISAM tables	support collections
 explain extended select * from t1 where MATCH(a,b) AGAINST ("collections");
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	100.00	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	100.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (match `test`.`t1`.`a`,`test`.`t1`.`b` against ('collections'))
+Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (match `test`.`t1`.`a`,`test`.`t1`.`b` against ('collections'))
 select * from t1 where MATCH(a,b) AGAINST ("indexes");
 a	b
 Full-text indexes	are called collections
@@ -57,45 +57,45 @@ Only MyISAM tables	support collections
 MySQL has now support	for full-text search
 Full-text search in MySQL	implements vector space model
 select * from t1 where MATCH(a,b) AGAINST ("indexes" IN BOOLEAN MODE WITH QUERY EXPANSION);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'QUERY EXPANSION)' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'QUERY EXPANSION)' at line 1
 explain select * from t1 where MATCH(a,b) AGAINST ("collections");
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	Using where
 explain select * from t1 where MATCH(a,b) AGAINST ("collections")>0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	Using where
 explain select * from t1 where MATCH(a,b) AGAINST ("collections")>1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	Using where
 explain select * from t1 where MATCH(a,b) AGAINST ("collections")>=0;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	Using where
 explain select * from t1 where MATCH(a,b) AGAINST ("collections")>=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	Using where
 explain select * from t1 where 0<MATCH(a,b) AGAINST ("collections");
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	Using where
 explain select * from t1 where 1<MATCH(a,b) AGAINST ("collections");
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	Using where
 explain select * from t1 where 0<=MATCH(a,b) AGAINST ("collections");
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	5	Using where
 explain select * from t1 where 1<=MATCH(a,b) AGAINST ("collections");
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	Using where
 explain select * from t1 where MATCH(a,b) AGAINST ("collections")>0 and a like '%ll%';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	Using where
 select * from t1 where MATCH(a,b) AGAINST("support -collections" IN BOOLEAN MODE);
 a	b
 MySQL has now support	for full-text search
 explain extended select * from t1 where MATCH(a,b) AGAINST("support -collections" IN BOOLEAN MODE);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	100.00	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	100.00	Using where
 Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (match `test`.`t1`.`a`,`test`.`t1`.`b` against ('support -collections' in boolean mode))
+Note	1003	select `test`.`t1`.`a` AS `a`,`test`.`t1`.`b` AS `b` from `test`.`t1` where (match `test`.`t1`.`a`,`test`.`t1`.`b` against ('support -collections' in boolean mode))
 select * from t1 where MATCH(a,b) AGAINST("support  collections" IN BOOLEAN MODE);
 a	b
 Only MyISAM tables	support collections
@@ -466,15 +466,15 @@ ANALYZE TABLE t1;
 EXPLAIN SELECT * FROM t1
 WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	b,a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	b,a	a	0		1	Using where
 EXPLAIN SELECT * FROM t1 USE INDEX(a)
 WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	Using where
 EXPLAIN SELECT * FROM t1 FORCE INDEX(a)
 WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	fulltext	a	a	0	NULL	1	Using where
+1	SIMPLE	t1	fulltext	a	a	0		1	Using where
 EXPLAIN SELECT * FROM t1 IGNORE INDEX(a)
 WHERE MATCH(a) AGAINST('test' IN BOOLEAN MODE) AND b=1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
@@ -523,12 +523,12 @@ DROP TABLE t1;
 #
 CREATE TABLE t1(col1 TEXT,
 FULLTEXT INDEX USING BTREE (col1));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USING BTREE (col1))' at line 2
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE (col1))' at line 2
 CREATE TABLE t2(col1 TEXT) ENGINE = InnoDB;
 CREATE FULLTEXT INDEX USING BTREE ON t2(col);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USING BTREE ON t2(col)' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE ON t2(col)' at line 1
 ALTER TABLE t2 ADD FULLTEXT INDEX USING BTREE (col1);
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'USING BTREE (col1)' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'USING BTREE (col1)' at line 1
 DROP TABLE t2;
 End of 5.0 tests
 #
@@ -550,7 +550,7 @@ WHERE t3.a=t1.a AND MATCH(b2) AGAINST('s
 );
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where
-2	DEPENDENT SUBQUERY	t2	fulltext	b2	b2	0	NULL	1	Using where
+2	DEPENDENT SUBQUERY	t2	fulltext	b2	b2	0		1	Using where
 2	DEPENDENT SUBQUERY	t3	ALL	NULL	NULL	NULL	NULL	2	Using where
 # should return 0
 SELECT count(*) FROM t1 WHERE 

=== removed file 'mysql-test/suite/innodb_fts/r/fulltext2.reject'
--- a/mysql-test/suite/innodb_fts/r/fulltext2.reject	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext2.reject	1970-01-01 00:00:00 +0000
@@ -1,256 +0,0 @@
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (
-i int(10) unsigned not null auto_increment primary key,
-a varchar(255) not null,
-FULLTEXT KEY (a)
-) ENGINE = INNODB;
-Warnings:
-Warning	1286	Unknown storage engine 'INNODB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-check table t1;
-Table	Op	Msg_type	Msg_text
-test.t1	check	status	OK
-select count(*) from t1 where match a against ('aaaxxx');
-count(*)
-260
-select count(*) from t1 where match a against ('aaayyy');
-count(*)
-250
-select count(*) from t1 where match a against ('aaazzz');
-count(*)
-255
-select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
-count(*)
-260
-select count(*) from t1 where match a against ('aaayyy' in boolean mode);
-count(*)
-250
-select count(*) from t1 where match a against ('aaazzz' in boolean mode);
-count(*)
-255
-select count(*) from t1 where match a against ('aaaxxx aaayyy aaazzz');
-count(*)
-765
-select count(*) from t1 where match a against ('aaaxxx aaayyy aaazzz' in boolean mode);
-count(*)
-765
-select count(*) from t1 where match a against ('aaax*' in boolean mode);
-count(*)
-260
-select count(*) from t1 where match a against ('aaay*' in boolean mode);
-count(*)
-250
-select count(*) from t1 where match a against ('aaa*' in boolean mode);
-count(*)
-765
-insert t1 (a) values ('aaaxxx'),('aaayyy');
-insert t1 (a) values ('aaazzz'),('aaazzz'),('aaazzz'),('aaazzz'),('aaazzz');
-select count(*) from t1 where match a against ('aaaxxx');
-count(*)
-261
-select count(*) from t1 where match a against ('aaayyy');
-count(*)
-251
-select count(*) from t1 where match a against ('aaazzz');
-count(*)
-260
-insert t1 (a) values ('aaaxxx 000000');
-select count(*) from t1 where match a against ('000000');
-count(*)
-1
-delete from t1 where match a against ('000000');
-select count(*) from t1 where match a against ('000000');
-count(*)
-0
-select count(*) from t1 where match a against ('aaaxxx');
-count(*)
-261
-delete from t1 where match a against ('aaazzz');
-select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
-count(*)
-261
-select count(*) from t1 where match a against ('aaayyy' in boolean mode);
-count(*)
-251
-select count(*) from t1 where match a against ('aaazzz' in boolean mode);
-count(*)
-0
-select count(*) from t1 where a = 'aaaxxx';
-count(*)
-261
-select count(*) from t1 where a = 'aaayyy';
-count(*)
-251
-select count(*) from t1 where a = 'aaazzz';
-count(*)
-0
-insert t1 (a) values ('aaaxxx 000000');
-select count(*) from t1 where match a against ('000000');
-count(*)
-1
-update t1 set a='aaazzz' where match a against ('000000');
-select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
-count(*)
-261
-select count(*) from t1 where match a against ('aaazzz' in boolean mode);
-count(*)
-1
-update t1 set a='aaazzz' where a = 'aaaxxx';
-update t1 set a='aaaxxx' where a = 'aaayyy';
-select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
-count(*)
-251
-select count(*) from t1 where match a against ('aaayyy' in boolean mode);
-count(*)
-0
-select count(*) from t1 where match a against ('aaazzz' in boolean mode);
-count(*)
-262
-drop table t1;
-CREATE TABLE t1 (
-i int(10) unsigned not null auto_increment primary key,
-a varchar(255) not null,
-FULLTEXT KEY (a)
-) ENGINE = INNODB;
-Warnings:
-Warning	1286	Unknown storage engine 'INNODB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-select count(*) from t1 where match a against ('aaaxxx');
-count(*)
-260
-select count(*) from t1 where match a against ('aaayyy');
-count(*)
-250
-select count(*) from t1 where match a against ('aaazzz');
-count(*)
-255
-select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
-count(*)
-260
-select count(*) from t1 where match a against ('aaayyy' in boolean mode);
-count(*)
-250
-select count(*) from t1 where match a against ('aaazzz' in boolean mode);
-count(*)
-255
-select count(*) from t1 where match a against ('aaaxxx aaayyy aaazzz');
-count(*)
-765
-select count(*) from t1 where match a against ('aaaxxx aaayyy aaazzz' in boolean mode);
-count(*)
-765
-select count(*) from t1 where match a against ('aaax*' in boolean mode);
-count(*)
-260
-select count(*) from t1 where match a against ('aaay*' in boolean mode);
-count(*)
-250
-select count(*) from t1 where match a against ('aaa*' in boolean mode);
-count(*)
-765
-insert t1 (a) values ('aaaxxx'),('aaayyy');
-insert t1 (a) values ('aaazzz'),('aaazzz'),('aaazzz'),('aaazzz'),('aaazzz');
-select count(*) from t1 where match a against ('aaaxxx');
-count(*)
-261
-select count(*) from t1 where match a against ('aaayyy');
-count(*)
-251
-select count(*) from t1 where match a against ('aaazzz');
-count(*)
-260
-insert t1 (a) values ('aaaxxx 000000');
-select count(*) from t1 where match a against ('000000');
-count(*)
-1
-delete from t1 where match a against ('000000');
-select count(*) from t1 where match a against ('000000');
-count(*)
-0
-select count(*) from t1 where match a against ('aaaxxx');
-count(*)
-261
-delete from t1 where match a against ('aaazzz');
-select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
-count(*)
-261
-select count(*) from t1 where match a against ('aaayyy' in boolean mode);
-count(*)
-251
-select count(*) from t1 where match a against ('aaazzz' in boolean mode);
-count(*)
-0
-select count(*) from t1 where a = 'aaaxxx';
-count(*)
-261
-select count(*) from t1 where a = 'aaayyy';
-count(*)
-251
-select count(*) from t1 where a = 'aaazzz';
-count(*)
-0
-insert t1 (a) values ('aaaxxx 000000');
-select count(*) from t1 where match a against ('000000');
-count(*)
-1
-update t1 set a='aaazzz' where match a against ('000000');
-select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
-count(*)
-261
-select count(*) from t1 where match a against ('aaazzz' in boolean mode);
-count(*)
-1
-update t1 set a='aaazzz' where a = 'aaaxxx';
-update t1 set a='aaaxxx' where a = 'aaayyy';
-select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
-count(*)
-251
-select count(*) from t1 where match a against ('aaayyy' in boolean mode);
-count(*)
-0
-select count(*) from t1 where match a against ('aaazzz' in boolean mode);
-count(*)
-262
-drop table t1;
-set names utf8;
-create table t1(a text,fulltext(a)) ENGINE = INNODB collate=utf8_swedish_ci;
-Warnings:
-Warning	1286	Unknown storage engine 'INNODB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-insert into t1 values('test test��'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test'),
-('test'),('test'),('test'),('test'),('test'),('test'),('test'),('test');
-delete from t1 limit 1;
-truncate table t1;
-insert into t1 values('ab��c d');
-update t1 set a='ab c d';
-select * from t1 where match a against('ab c' in boolean mode);
-a
-select * from t1 where match a against('ab	c' in boolean mode);
-a
-drop table t1;
-set names latin1;
-SET NAMES utf8;
-CREATE TABLE t1(a VARCHAR(255), FULLTEXT(a)) ENGINE = INNODB DEFAULT CHARSET=utf8;
-Warnings:
-Warning	1286	Unknown storage engine 'INNODB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-INSERT INTO t1 VALUES('���MySQL���');
-SELECT a FROM t1 WHERE MATCH a AGAINST('���MySQL���' IN BOOLEAN MODE);
-a
-���MySQL���
-DROP TABLE t1;
-SET NAMES latin1;

=== removed file 'mysql-test/suite/innodb_fts/r/fulltext3.reject'
--- a/mysql-test/suite/innodb_fts/r/fulltext3.reject	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext3.reject	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a)) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-SET NAMES utf8;
-DELETE FROM t1 LIMIT 1;
-SET NAMES latin1;
-DROP TABLE t1;
-CREATE TABLE t1(a VARCHAR(2) CHARACTER SET big5 COLLATE big5_chinese_ci,
-FULLTEXT(a)) ENGINE=<default_engine>;
-DROP TABLE t1;

=== removed file 'mysql-test/suite/innodb_fts/r/fulltext_left_join.reject'
--- a/mysql-test/suite/innodb_fts/r/fulltext_left_join.reject	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext_left_join.reject	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-drop table if exists t1, t2;
-CREATE TABLE t1 (
-id           VARCHAR(255) NOT NULL PRIMARY KEY,
-sujet        VARCHAR(255),
-motsclefs    TEXT,
-texte        MEDIUMTEXT,
-FULLTEXT(sujet, motsclefs, texte)
-) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-INSERT INTO t1 VALUES('123','toto','essai','test');
-INSERT INTO t1 VALUES('456','droit','penal','lawyer');
-INSERT INTO t1 VALUES('789','aaaaa','bbbbb','cccccc');
-CREATE TABLE t2 (
-id         VARCHAR(255) NOT NULL,
-author     VARCHAR(255) NOT NULL
-) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't2'
-INSERT INTO t2 VALUES('123', 'moi');
-INSERT INTO t2 VALUES('123', 'lui');
-INSERT INTO t2 VALUES('456', 'lui');
-ANALYZE TABLE t1;
-ANALYZE TABLE t2;
-select round(match(t1.texte,t1.sujet,t1.motsclefs) against('droit'),5)
-from t1 left join t2 on t2.id=t1.id;
-round(match(t1.texte,t1.sujet,t1.motsclefs) against('droit'),5)
-0.00000
-0.00000
-0.67003
-0.00000
-select match(t1.texte,t1.sujet,t1.motsclefs) against('droit' IN BOOLEAN MODE)
-from t1 left join t2 on t2.id=t1.id;
-match(t1.texte,t1.sujet,t1.motsclefs) against('droit' IN BOOLEAN MODE)
-0
-0
-1
-0
-drop table t1, t2;
-create table t1 (venue_id int(11) default null, venue_text varchar(255) default null, dt datetime default null) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-insert into t1 (venue_id, venue_text, dt) values (1, 'a1', '2003-05-23 19:30:00'),(null, 'a2', '2003-05-23 19:30:00');
-create table t2 (name varchar(255) not null default '', entity_id int(11) not null auto_increment, primary key  (entity_id), fulltext key name (name)) engine= innodb;
-Warnings:
-Warning	1286	Unknown storage engine 'innodb'
-Warning	1266	Using storage engine MyISAM for table 't2'
-insert into t2 (name, entity_id) values ('aberdeen town hall', 1), ('glasgow royal concert hall', 2), ('queen\'s hall, edinburgh', 3);
-ANALYZE TABLE t1;
-ANALYZE TABLE t2;
-select * from t1 left join t2 on venue_id = entity_id where match(name) against('aberdeen' in boolean mode) and dt = '2003-05-23 19:30:00';
-venue_id	venue_text	dt	name	entity_id
-1	a1	2003-05-23 19:30:00	aberdeen town hall	1
-select * from t1 left join t2 on venue_id = entity_id where match(name) against('aberdeen') and dt = '2003-05-23 19:30:00';
-venue_id	venue_text	dt	name	entity_id
-1	a1	2003-05-23 19:30:00	aberdeen town hall	1
-select * from t1 left join t2 on (venue_id = entity_id and match(name) against('aberdeen' in boolean mode)) where dt = '2003-05-23 19:30:00';
-venue_id	venue_text	dt	name	entity_id
-1	a1	2003-05-23 19:30:00	aberdeen town hall	1
-NULL	a2	2003-05-23 19:30:00	NULL	NULL
-select * from t1 left join t2 on (venue_id = entity_id and match(name) against('aberdeen')) where dt = '2003-05-23 19:30:00';
-venue_id	venue_text	dt	name	entity_id
-1	a1	2003-05-23 19:30:00	aberdeen town hall	1
-NULL	a2	2003-05-23 19:30:00	NULL	NULL
-drop table t1,t2;
-create table t1 (id int not null primary key, d char(200) not null, e char(200), fulltext (d, e)) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-insert into t1 values (1, 'aword', null), (2, 'aword', 'bword'), (3, 'bword', null), (4, 'bword', 'aword'), (5, 'aword and bword', null);
-ANALYZE TABLE t1;
-select * from t1 where match(d, e) against ('+aword +bword' in boolean mode);
-id	d	e
-2	aword	bword
-4	bword	aword
-5	aword and bword	NULL
-create table t2 (m_id int not null, f char(200), key (m_id), fulltext (f)) engine = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't2'
-insert into t2 values (1, 'bword'), (3, 'aword'), (5, '');
-ANALYZE TABLE t2;
-select * from t1 left join t2 on m_id = id where match(d, e, f) against ('+aword +bword' in boolean mode);
-id	d	e	m_id	f
-1	aword	NULL	1	bword
-2	aword	bword	NULL	NULL
-3	bword	NULL	3	aword
-4	bword	aword	NULL	NULL
-5	aword and bword	NULL	5	
-drop table t1,t2;
-CREATE TABLE t1 (
-id int(10) NOT NULL auto_increment,
-link int(10) default NULL,
-name mediumtext default NULL,
-PRIMARY KEY (id),
-FULLTEXT (name)
-) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-INSERT INTO t1 VALUES (1, 1, 'string');
-INSERT INTO t1 VALUES (2, 0, 'string');
-CREATE TABLE t2 (
-id int(10) NOT NULL auto_increment,
-name mediumtext default NULL,
-PRIMARY KEY (id),
-FULLTEXT (name)
-) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't2'
-INSERT INTO t2 VALUES (1, 'string');
-ANALYZE TABLE t1;
-ANALYZE TABLE t2;
-SELECT t1.*, MATCH(t1.name) AGAINST('string') AS relevance 
-FROM t1 LEFT JOIN t2 ON t1.link = t2.id
-WHERE MATCH(t1.name, t2.name) AGAINST('string' IN BOOLEAN MODE);
-id	link	name	relevance
-1	1	string	0
-2	0	string	0
-DROP TABLE t1,t2;
-CREATE TABLE t1 (a INT) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-CREATE TABLE t2 (b INT, c TEXT, KEY(b), FULLTEXT(c)) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't2'
-INSERT INTO t1 VALUES(1);
-INSERT INTO t2(b,c) VALUES(2,'castle'),(3,'castle');
-ANALYZE TABLE t1;
-ANALYZE TABLE t2;
-SELECT * FROM t1 LEFT JOIN t2 ON a=b WHERE MATCH(c) AGAINST('+castle' IN BOOLEAN MODE);
-a	b	c
-DROP TABLE t1, t2;

=== removed file 'mysql-test/suite/innodb_fts/r/fulltext_multi.reject'
--- a/mysql-test/suite/innodb_fts/r/fulltext_multi.reject	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext_multi.reject	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (
-a int(11) NOT NULL auto_increment,
-b text,
-c varchar(254) default NULL,
-PRIMARY KEY (a),
-FULLTEXT KEY bb(b),
-FULLTEXT KEY cc(c),
-FULLTEXT KEY a(b,c)
-) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-drop table t1;
-CREATE TABLE t1 (
-a int(11) NOT NULL auto_increment,
-b text,
-c varchar(254) default NULL,
-PRIMARY KEY (a),
-FULLTEXT KEY a(b,c)
-) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
-INSERT INTO t1 VALUES (1,'lala lolo lili','oooo aaaa pppp');
-INSERT INTO t1 VALUES (2,'asdf fdsa','lkjh fghj');
-INSERT INTO t1 VALUES (3,'qpwoei','zmxnvb');
-ANALYZE TABLE t1;
-SELECT a, round(MATCH  b,c AGAINST ('lala lkjh'),5) FROM t1;
-a	round(MATCH  b,c AGAINST ('lala lkjh'),5)
-1	0.64841
-2	0.66266
-3	0.00000
-SELECT a, round(MATCH  c,c AGAINST ('lala lkjh'),5) FROM t1;
-a	round(MATCH  c,c AGAINST ('lala lkjh'),5)
-1	0.64841
-2	0.66266
-3	0.00000
-SELECT a, round(MATCH b,c AGAINST ('lala lkjh'),5) FROM t1;
-a	round(MATCH b,c AGAINST ('lala lkjh'),5)
-1	0.64841
-2	0.66266
-3	0.00000
-drop table t1;

=== modified file 'mysql-test/suite/innodb_fts/r/fulltext_order_by.reject'
--- a/mysql-test/suite/innodb_fts/r/fulltext_order_by.reject	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext_order_by.reject	2013-08-07 10:38:24 +0000
@@ -4,68 +4,65 @@ a INT AUTO_INCREMENT PRIMARY KEY,
 message CHAR(20),
 FULLTEXT(message)
 ) ENGINE = InnoDB comment = 'original testcase by sroussey at network54.com';
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
 INSERT INTO t1 (message) VALUES ("Testing"),("table"),("testbug"),
 ("steve"),("is"),("cool"),("steve is cool");
 ANALYZE TABLE t1;
 SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) FROM t1 WHERE MATCH (message) AGAINST ('steve');
 a	FORMAT(MATCH (message) AGAINST ('steve'),6)
-4	0.905873
-7	0.895690
+4	0.296010
+7	0.296010
 SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE MATCH (message) AGAINST ('steve');
 a	MATCH (message) AGAINST ('steve' IN BOOLEAN MODE)
-4	1
-7	1
+4	0.2960100471973419
+7	0.2960100471973419
 SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) FROM t1 WHERE MATCH (message) AGAINST ('steve' IN BOOLEAN MODE);
 a	FORMAT(MATCH (message) AGAINST ('steve'),6)
-4	0.905873
-7	0.895690
+4	0.296010
+7	0.296010
 SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE MATCH (message) AGAINST ('steve' IN BOOLEAN MODE);
 a	MATCH (message) AGAINST ('steve' IN BOOLEAN MODE)
-4	1
-7	1
+4	0.2960100471973419
+7	0.2960100471973419
 SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY a;
 a	FORMAT(MATCH (message) AGAINST ('steve'),6)
-4	0.905873
-7	0.895690
+4	0.296010
+7	0.296010
 SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) ORDER BY a;
 a	MATCH (message) AGAINST ('steve' IN BOOLEAN MODE)
-4	1
-7	1
+4	0.2960100471973419
+7	0.2960100471973419
 SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) FROM t1 WHERE a in (2,7,4) and MATCH (message) AGAINST ('steve') ORDER BY a DESC;
 a	FORMAT(MATCH (message) AGAINST ('steve'),6)
-7	0.895690
-4	0.905873
+7	0.296010
+4	0.296010
 SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE a in (2,7,4) and MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) ORDER BY a DESC;
 a	MATCH (message) AGAINST ('steve' IN BOOLEAN MODE)
-7	1
-4	1
+7	0.2960100471973419
+4	0.2960100471973419
 SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) FROM t1 WHERE a=7 and MATCH (message) AGAINST ('steve') ORDER BY 1;
 a	FORMAT(MATCH (message) AGAINST ('steve'),6)
-7	0.895690
+7	0.296010
 SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) FROM t1 WHERE a=7 and MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) ORDER BY 1;
 a	MATCH (message) AGAINST ('steve' IN BOOLEAN MODE)
-7	1
+7	0.2960100471973419
 SELECT a, FORMAT(MATCH (message) AGAINST ('steve'),6) as rel FROM t1 ORDER BY rel;
 a	rel
+6	0.000000
+3	0.000000
 1	0.000000
 5	0.000000
 2	0.000000
-6	0.000000
-3	0.000000
-7	0.895690
-4	0.905873
+7	0.296010
+4	0.296010
 SELECT a, MATCH (message) AGAINST ('steve' IN BOOLEAN MODE) as rel FROM t1 ORDER BY rel;
 a	rel
+6	0
 1	0
 2	0
 3	0
 5	0
-6	0
-4	1
-7	1
+7	0.2960100471973419
+4	0.2960100471973419
 alter table t1 add key m (message);
 ANALYZE TABLE t1;
 explain SELECT message FROM t1 WHERE MATCH (message) AGAINST ('steve') ORDER BY message;
@@ -81,19 +78,16 @@ a INT AUTO_INCREMENT PRIMARY KEY,
 message CHAR(20),
 FULLTEXT(message)
 ) ENGINE = InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
 INSERT INTO t1 (message) VALUES ("testbug"),("testbug foobar");
 ANALYZE TABLE t1;
 SELECT a, MATCH (message) AGAINST ('t* f*' IN BOOLEAN MODE) as rel FROM t1;
 a	rel
-1	1
-2	2
+1	0.000000001885928302414186
+2	0.0906190574169159
 SELECT a, MATCH (message) AGAINST ('t* f*' IN BOOLEAN MODE) as rel FROM t1 ORDER BY rel,a;
 a	rel
-1	1
-2	2
+1	0.000000001885928302414186
+2	0.0906190574169159
 drop table t1;
 CREATE TABLE t1 (
 id int(11) NOT NULL auto_increment,
@@ -103,18 +97,12 @@ PRIMARY KEY  (id),
 KEY thread (thread),
 FULLTEXT KEY beitrag (beitrag)
 ) ENGINE =InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=7923 ;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
 CREATE TABLE t2 (
 id int(11) NOT NULL auto_increment,
 text varchar(100) NOT NULL default '',
 PRIMARY KEY  (id),
 KEY text (text)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=63 ;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't2'
 CREATE TABLE t3 (
 id int(11) NOT NULL auto_increment,
 forum int(11) NOT NULL default '0',
@@ -123,9 +111,6 @@ PRIMARY KEY  (id),
 KEY forum (forum),
 FULLTEXT KEY betreff (betreff)
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=996 ;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't3'
 select a.text, b.id, b.betreff
 from 
 t2 a inner join t3 b on a.id = b.forum inner join

=== removed file 'mysql-test/suite/innodb_fts/r/fulltext_update.reject'
--- a/mysql-test/suite/innodb_fts/r/fulltext_update.reject	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext_update.reject	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-drop table if exists test;
-CREATE TABLE test (
-gnr INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-url VARCHAR(80) DEFAULT '' NOT NULL,
-shortdesc VARCHAR(200) DEFAULT '' NOT NULL,
-longdesc text DEFAULT '' NOT NULL,
-description VARCHAR(80) DEFAULT '' NOT NULL,
-name VARCHAR(80) DEFAULT '' NOT NULL,
-FULLTEXT(url,description,shortdesc,longdesc),
-PRIMARY KEY(gnr)
-) ENGINE = InnoDB;
-Warnings:
-Warning	1101	BLOB/TEXT column 'longdesc' can't have a default value
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 'test'
-insert into test (url,shortdesc,longdesc,description,name) VALUES 
-("http:/test.at", "kurz", "lang","desc", "name");
-insert into test (url,shortdesc,longdesc,description,name) VALUES 
-("http:/test.at", "kurz", "","desc", "name");
-update test set url='test', description='ddd', name='nam' where gnr=2;
-update test set url='test', shortdesc='ggg', longdesc='mmm', 
-description='ddd', name='nam' where gnr=2;
-check table test;
-Table	Op	Msg_type	Msg_text
-test.test	check	status	OK
-drop table test;

=== removed file 'mysql-test/suite/innodb_fts/r/fulltext_var.reject'
--- a/mysql-test/suite/innodb_fts/r/fulltext_var.reject	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/fulltext_var.reject	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-drop table if exists t1;
-show variables like "ft\_%";
-Variable_name	Value
-ft_boolean_syntax	+ -><()~*:""&|
-ft_max_word_len	84
-ft_min_word_len	4
-ft_query_expansion_limit	20
-ft_stopword_file	(built-in)
-create table t1 (b text not null, fulltext(b)) engine = innodb;
-Warnings:
-Warning	1286	Unknown storage engine 'innodb'
-Warning	1266	Using storage engine MyISAM for table 't1'
-insert t1 values ('aaaaaa bbbbbb cccccc');
-insert t1 values ('bbbbbb cccccc');
-insert t1 values ('aaaaaa cccccc');
-select * from t1 where match b against ('+aaaaaa bbbbbb' in boolean mode);
-b
-aaaaaa bbbbbb cccccc
-aaaaaa cccccc
-set ft_boolean_syntax=' +-><()~*:""&|';
-ERROR HY000: Variable 'ft_boolean_syntax' is a GLOBAL variable and should be set with SET GLOBAL
-set global ft_boolean_syntax=' +-><()~*:""&|';
-select * from t1 where match b against ('+aaaaaa bbbbbb' in boolean mode);
-b
-aaaaaa bbbbbb cccccc
-bbbbbb cccccc
-set global ft_boolean_syntax='@ -><()~*:""&|';
-select * from t1 where match b against ('+aaaaaa bbbbbb' in boolean mode);
-b
-aaaaaa bbbbbb cccccc
-bbbbbb cccccc
-aaaaaa cccccc
-select * from t1 where match b against ('+aaaaaa @bbbbbb' in boolean mode);
-b
-aaaaaa bbbbbb cccccc
-bbbbbb cccccc
-set global ft_boolean_syntax='@ -><()~*:""@|';
-ERROR 42000: Variable 'ft_boolean_syntax' can't be set to the value of '@ -><()~*:""@|'
-set global ft_boolean_syntax='+ -><()~*:""@!|';
-ERROR 42000: Variable 'ft_boolean_syntax' can't be set to the value of '+ -><()~*:""@!|'
-drop table t1;

=== modified file 'mysql-test/suite/innodb_fts/r/innodb_fts_misc_debug.result'
--- a/mysql-test/suite/innodb_fts/r/innodb_fts_misc_debug.result	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/r/innodb_fts_misc_debug.result	2013-08-07 10:38:24 +0000
@@ -15,7 +15,7 @@ INSERT INTO articles (title,body) VALUES
 BEGIN;
 INSERT INTO articles (title,body) VALUES
 ('MySQL Tutorial','DBMS stands for DataBase ...');
-SET SESSION debug="+d,crash_commit_before";
+SET SESSION debug_dbug="+d,crash_commit_before";
 COMMIT;
 ERROR HY000: Lost connection to MySQL server during query
 INSERT INTO articles (title,body) VALUES
@@ -38,7 +38,7 @@ INSERT INTO articles (title,body) VALUES
 BEGIN;
 INSERT INTO articles (title,body) VALUES
 ('MySQL Tutorial','DBMS stands for DataBase ...');
-SET SESSION debug="+d,crash_commit_before";
+SET SESSION debug_dbug="+d,crash_commit_before";
 COMMIT;
 ERROR HY000: Lost connection to MySQL server during query
 INSERT INTO articles (title,body) VALUES
@@ -71,7 +71,7 @@ INSERT INTO articles VALUES
 BEGIN;
 INSERT INTO articles VALUES
 (100, 200, 'MySQL Tutorial','DBMS stands for DataBase ...');
-SET SESSION debug="+d,crash_commit_before";
+SET SESSION debug_dbug="+d,crash_commit_before";
 COMMIT;
 ERROR HY000: Lost connection to MySQL server during query
 INSERT INTO articles VALUES         (8, 12, 'MySQL Tutorial','DBMS stands for DataBase ...');
@@ -88,9 +88,9 @@ title VARCHAR(200),
 body TEXT,
 FULLTEXT (title,body)
 ) ENGINE=InnoDB;
-SET SESSION debug="+d,ib_dict_create_index_tree_fail";
+SET SESSION debug_dbug="+d,ib_dict_create_index_tree_fail";
 CREATE FULLTEXT INDEX idx ON articles(body);
 ERROR HY000: Out of memory; check if mysqld or some other process uses all available memory; if not, you may have to use 'ulimit' to allow mysqld to use more memory or you can add more swap space
-SET SESSION debug="-d,ib_dict_create_index_tree_fail";
+SET SESSION debug_dbug="-d,ib_dict_create_index_tree_fail";
 ALTER TABLE articles STATS_PERSISTENT=DEFAULT;
 DROP TABLE articles;

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext.test	2013-08-07 10:38:24 +0000
@@ -2,6 +2,8 @@
 # Test of fulltext index
 #
 
+--source include/have_innodb.inc
+
 --disable_warnings
 drop table if exists t1,t2,t3;
 --enable_warnings

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext2.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext2.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext2.test	2013-08-07 10:38:24 +0000
@@ -6,6 +6,7 @@
 # two-level tree
 #
 
+--source include/have_innodb.inc
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext3.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext3.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext3.test	2013-08-07 10:38:24 +0000
@@ -2,6 +2,7 @@
 #
 # test of new fulltext search features
 #
+--source include/have_innodb.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext_cache.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext_cache.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext_cache.test	2013-08-07 10:38:24 +0000
@@ -1,6 +1,7 @@
 #
 # Bugreport due to Roy Nasser <roy at vem.ca>
 #
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists t1, t2;

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext_distinct.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext_distinct.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext_distinct.test	2013-08-07 10:38:24 +0000
@@ -2,6 +2,7 @@
 # Test of fulltext index
 # bug reported by  Tibor Simko <tibor.simko at cern.ch>
 #
+--source include/have_innodb.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS t1, t2;

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext_left_join.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext_left_join.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext_left_join.test	2013-08-07 10:38:24 +0000
@@ -1,6 +1,7 @@
 #
 # Test for bug from Jean-C�dric COSTA <jean-cedric.costa at ensmp.fr>
 #
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists t1, t2;

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext_misc.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext_misc.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext_misc.test	2013-08-07 10:38:24 +0000
@@ -1,6 +1,8 @@
 #
 # Fulltext configurable parameters
 #
+--source include/have_innodb.inc
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext_multi.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext_multi.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext_multi.test	2013-08-07 10:38:24 +0000
@@ -1,4 +1,6 @@
 # several FULLTEXT indexes in one table test
+--source include/have_innodb.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext_order_by.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext_order_by.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext_order_by.test	2013-08-07 10:38:24 +0000
@@ -1,3 +1,6 @@
+
+--source include/have_innodb.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1,t2,t3;
 --enable_warnings

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext_update.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext_update.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext_update.test	2013-08-07 10:38:24 +0000
@@ -1,6 +1,7 @@
 #
 # Test for bug by voi at ims.at
 #
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists test;

=== modified file 'mysql-test/suite/innodb_fts/t/fulltext_var.test'
--- a/mysql-test/suite/innodb_fts/t/fulltext_var.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/fulltext_var.test	2013-08-07 10:38:24 +0000
@@ -1,6 +1,8 @@
 #
 # Fulltext configurable parameters
 #
+--source include/have_innodb.inc
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings

=== modified file 'mysql-test/suite/innodb_fts/t/innodb_fts_large_records.test'
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_large_records.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_large_records.test	2013-08-07 10:38:24 +0000
@@ -2,6 +2,8 @@
 # case a) more words in single record
 # b) more words across records
 
+--source include/have_innodb.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings

=== modified file 'mysql-test/suite/innodb_fts/t/innodb_fts_misc.test'
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_misc.test	2013-08-07 10:38:24 +0000
@@ -1,6 +1,10 @@
 #------------------------------------------------------------------------------
 # Test With alter/create/drop index
 #------------------------------------------------------------------------------
+--source include/have_innodb.inc
+let collation=UTF8_UNICODE_520_CI;
+--source include/have_collation.inc
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings

=== modified file 'mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test'
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_misc_1.test	2013-08-07 10:38:24 +0000
@@ -1,6 +1,8 @@
 #------------------------------------------------------------------------------
 # FTS with FK and update cascade
 #-------------------------------------------------------------------------------
+--source include/have_innodb.inc
+
 --disable_warnings
 drop table if exists t2,t1;
 --enable_warnings

=== modified file 'mysql-test/suite/innodb_fts/t/innodb_fts_misc_debug.test'
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_misc_debug.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_misc_debug.test	2013-08-07 10:38:24 +0000
@@ -47,7 +47,7 @@ INSERT INTO articles (title,body) VALUES
         ('MySQL Tutorial','DBMS stands for DataBase ...');
 
 # Request a crash on next execution of commit.
-SET SESSION debug="+d,crash_commit_before";
+SET SESSION debug_dbug="+d,crash_commit_before";
 #
 # Write file to make mysql-test-run.pl start up the server again
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
@@ -97,7 +97,7 @@ INSERT INTO articles (title,body) VALUES
         ('MySQL Tutorial','DBMS stands for DataBase ...');
 
 # Request a crash on next execution of commit.
-SET SESSION debug="+d,crash_commit_before";
+SET SESSION debug_dbug="+d,crash_commit_before";
 #
 # Write file to make mysql-test-run.pl start up the server again
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
@@ -157,7 +157,7 @@ INSERT INTO articles VALUES
         (100, 200, 'MySQL Tutorial','DBMS stands for DataBase ...');
 
 # Request a crash on next execution of commit.
-SET SESSION debug="+d,crash_commit_before";
+SET SESSION debug_dbug="+d,crash_commit_before";
 #
 # Write file to make mysql-test-run.pl start up the server again
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
@@ -197,10 +197,10 @@ CREATE TABLE articles (
 # Abort the operation in dict_create_index_step by setting
 # return status of dict_create_index_tree_step() to DB_OUT_OF_MEMORY
 # The newly create dict_index_t should be removed from fts cache
-SET SESSION debug="+d,ib_dict_create_index_tree_fail";
+SET SESSION debug_dbug="+d,ib_dict_create_index_tree_fail";
 --error ER_OUT_OF_RESOURCES
 CREATE FULLTEXT INDEX idx ON articles(body);
-SET SESSION debug="-d,ib_dict_create_index_tree_fail";
+SET SESSION debug_dbug="-d,ib_dict_create_index_tree_fail";
 
 # This simply go through ha_innobase::commit_inplace_alter_table
 # and do a fts_check_cached_index()

=== modified file 'mysql-test/suite/innodb_fts/t/innodb_fts_multiple_index.test'
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_multiple_index.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_multiple_index.test	2013-08-07 10:38:24 +0000
@@ -1,6 +1,8 @@
 #------------------------------------------------------------------------------
 # Test With two FTS index on same table + alter/create/drop index + tnx
 #------------------------------------------------------------------------------
+--source include/have_innodb.inc
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings

=== modified file 'mysql-test/suite/innodb_fts/t/innodb_fts_opt.test'
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_opt.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_opt.test	2013-08-07 10:38:24 +0000
@@ -1,6 +1,7 @@
 #  
 # Tests for optimizations for InnoDB fulltext search (WL#6043)
 #
+--source include/have_innodb.inc
 
 CREATE TABLE wp(
   FTS_DOC_ID BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,

=== modified file 'mysql-test/suite/innodb_fts/t/innodb_fts_proximity.test'
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_proximity.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_proximity.test	2013-08-07 10:38:24 +0000
@@ -1,6 +1,7 @@
 # This is the DDL function tests for innodb FTS
 # Functional testing with FTS proximity search using '@'
 # and try search default words
+--source include/have_innodb.inc
 
 --disable_warnings
 drop table if exists t1;

=== modified file 'mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test'
--- a/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test	2013-08-07 09:55:00 +0000
+++ b/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test	2013-08-07 10:38:24 +0000
@@ -4,6 +4,7 @@
 # 2) records will be seen using FTS index ONLY when transaction completes 
 # 3) UNCOMMITTED RECORDS CAN BE SEEN WITH QURIES WHICH DO NOT USE FTS INDEX
 # this behavior do not break integratity of tables and "select" which do not use FTS still can view them.
+--source include/have_innodb.inc
 
 
 --disable_warnings



More information about the commits mailing list