merged

4 files changed, 967 insertions, 0 deletions

diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index 1382c31d145..c40e9d9bfa2 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -16,6 +16,8 @@ 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
 select * from t1 where MATCH(a,b) AGAINST ("collections") UNION ALL select * from t1 where MATCH(a,b) AGAINST ("indexes");
 a	b
 Only MyISAM tables	support collections
diff --git a/mysql-test/r/fulltext2.result b/mysql-test/r/fulltext2.result
new file mode 100644
index 00000000000..8086faadba4
--- /dev/null
+++ b/mysql-test/r/fulltext2.result
@@ -0,0 +1,871 @@
+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)
+) TYPE=MyISAM;
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaaxxx');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaazzz');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+insert t1 (a) values ('aaayyy');
+repair table t1 quick;
+Table	Op	Msg_type	Msg_text
+test.t1	repair	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 IF EXISTS t1;
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 02c407abd6c..214236268fa 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -18,6 +18,7 @@ INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),
 select * from t1 where MATCH(a,b) AGAINST ("collections");
 select * from t1 where MATCH(a,b) AGAINST ("indexes");
 select * from t1 where MATCH(a,b) AGAINST ("indexes collections");
+select * from t1 where MATCH(a,b) AGAINST ("only");
 
 # UNION of fulltext's
 select * from t1 where MATCH(a,b) AGAINST ("collections") UNION ALL select * from t1 where MATCH(a,b) AGAINST ("indexes");
diff --git a/mysql-test/t/fulltext2.test b/mysql-test/t/fulltext2.test
new file mode 100644
index 00000000000..998747018b4
--- /dev/null
+++ b/mysql-test/t/fulltext2.test
@@ -0,0 +1,93 @@
+#
+# test of new fulltext search features
+#
+
+#
+# two-level tree
+#
+
+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)
+) TYPE=MyISAM;
+
+# two-level entry, second-level tree with depth 2
+let $1=260;
+while ($1)
+{
+  eval insert t1 (a) values ('aaaxxx');
+  dec $1;
+}
+
+# two-level entry, second-level tree has only one page
+let $1=255;
+while ($1)
+{
+  eval insert t1 (a) values ('aaazzz');
+  dec $1;
+}
+
+# one-level entry (entries)
+let $1=250;
+while ($1)
+{
+  eval insert t1 (a) values ('aaayyy');
+  dec $1;
+}
+
+# converting to two-level
+repair table t1 quick;
+
+select count(*) from t1 where match a against ('aaaxxx');
+select count(*) from t1 where match a against ('aaayyy');
+select count(*) from t1 where match a against ('aaazzz');
+select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
+select count(*) from t1 where match a against ('aaayyy' in boolean mode);
+select count(*) from t1 where match a against ('aaazzz' in boolean mode);
+select count(*) from t1 where match a against ('aaaxxx aaayyy aaazzz');
+select count(*) from t1 where match a against ('aaaxxx aaayyy aaazzz' in boolean mode);
+
+select count(*) from t1 where match a against ('aaax*' in boolean mode);
+select count(*) from t1 where match a against ('aaay*' in boolean mode);
+select count(*) from t1 where match a against ('aaa*' in boolean mode);
+
+# mi_write:
+
+insert t1 (a) values ('aaaxxx'),('aaayyy');
+# call to enlarge_root() below
+insert t1 (a) values ('aaazzz'),('aaazzz'),('aaazzz'),('aaazzz'),('aaazzz');
+select count(*) from t1 where match a against ('aaaxxx');
+select count(*) from t1 where match a against ('aaayyy');
+select count(*) from t1 where match a against ('aaazzz');
+
+# mi_delete
+insert t1 (a) values ('aaaxxx 000000');
+select count(*) from t1 where match a against ('000000');
+delete from t1 where match a against ('000000');
+select count(*) from t1 where match a against ('000000');
+select count(*) from t1 where match a against ('aaaxxx');
+delete from t1 where match a against ('aaazzz');
+select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
+select count(*) from t1 where match a against ('aaayyy' in boolean mode);
+select count(*) from t1 where match a against ('aaazzz' in boolean mode);
+# double-check without index
+select count(*) from t1 where a = 'aaaxxx';
+select count(*) from t1 where a = 'aaayyy';
+select count(*) from t1 where a = 'aaazzz';
+
+# update
+insert t1 (a) values ('aaaxxx 000000');
+select count(*) from t1 where match a against ('000000');
+update t1 set a='aaazzz' where match a against ('000000');
+select count(*) from t1 where match a against ('aaaxxx' in boolean mode);
+select count(*) from t1 where match a against ('aaazzz' in boolean mode);
+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);
+select count(*) from t1 where match a against ('aaayyy' in boolean mode);
+select count(*) from t1 where match a against ('aaazzz' in boolean mode);
+
+DROP TABLE IF EXISTS t1;
+