diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/analyse.result | 3 | ||||
| -rw-r--r-- | mysql-test/r/fulltext.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/fulltext2.result | 871 | ||||
| -rw-r--r-- | mysql-test/r/handler.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/subselect.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/analyse.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/fulltext.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/fulltext2.test | 96 | ||||
| -rw-r--r-- | mysql-test/t/handler.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/subselect.test | 3 |
10 files changed, 983 insertions, 0 deletions
diff --git a/mysql-test/r/analyse.result b/mysql-test/r/analyse.result index ede83afe4e1..0cb33526457 100644 --- a/mysql-test/r/analyse.result +++ b/mysql-test/r/analyse.result @@ -1,6 +1,9 @@ drop table if exists t1,t2; create table t1 (i int, j int); insert into t1 values (1,2), (3,4), (5,6), (7,8); +select count(*) from t1 procedure analyse(); +Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype + -6510615555426900571 -6510615555426900571 -6510615555426900571 -6510615555426900571 select * from t1 procedure analyse(); Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL 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/r/handler.result b/mysql-test/r/handler.result index 35765c48049..b47f97e167f 100644 --- a/mysql-test/r/handler.result +++ b/mysql-test/r/handler.result @@ -5,6 +5,8 @@ insert into t1 values (14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"), (20,"ggg"),(21,"hhh"),(22,"iii"); handler t1 open as t2; +handler t2 read a=(SELECT 1); +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 'SELECT 1)' at line 1 handler t2 read a first; a b 14 aaa diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 04bf0575db3..2bbbd71f4cd 100644 --- a/mysql-test/r/subselect.result +++ b/mysql-test/r/subselect.result @@ -120,6 +120,8 @@ SELECT (SELECT 1.5,2,'a') = ROW(1.5,'c','a'); SELECT (SELECT 1.5,'c','a') = ROW(1.5,2,'a'); (SELECT 1.5,'c','a') = ROW(1.5,2,'a') 0 +SELECT (SELECT * FROM (SELECT 'test' a,'test' b) a); +Cardinality error (more/less than 1 columns) create table t1 (a int); create table t2 (a int, b int); create table t3 (a int); diff --git a/mysql-test/t/analyse.test b/mysql-test/t/analyse.test index ccbfb56a801..117ca40ce54 100644 --- a/mysql-test/t/analyse.test +++ b/mysql-test/t/analyse.test @@ -7,6 +7,7 @@ drop table if exists t1,t2; --enable_warnings create table t1 (i int, j int); insert into t1 values (1,2), (3,4), (5,6), (7,8); +select count(*) from t1 procedure analyse(); select * from t1 procedure analyse(); create table t2 select * from t1 procedure analyse(); select * from t2; 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..2c0d352a870 --- /dev/null +++ b/mysql-test/t/fulltext2.test @@ -0,0 +1,96 @@ +# +# test of new fulltext search features +# + +# +# two-level tree +# + +--disable_warnings +DROP TABLE IF EXISTS t1; +--enable_warnings + +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; + diff --git a/mysql-test/t/handler.test b/mysql-test/t/handler.test index 2b0a6a7be8d..b72b739600e 100644 --- a/mysql-test/t/handler.test +++ b/mysql-test/t/handler.test @@ -12,6 +12,8 @@ insert into t1 values (14,"aaa"),(15,"bbb"),(16,"ccc"),(16,"xxx"), (20,"ggg"),(21,"hhh"),(22,"iii"); handler t1 open as t2; +-- error 1064 +handler t2 read a=(SELECT 1); handler t2 read a first; handler t2 read a next; handler t2 read a next; diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 1dcbd9a282d..b506baa9fdd 100644 --- a/mysql-test/t/subselect.test +++ b/mysql-test/t/subselect.test @@ -51,6 +51,9 @@ SELECT (SELECT 'b',2,'a') = ROW(1.5,2,'a'); SELECT (SELECT 1.5,2,'a') = ROW(1.5,'c','a'); SELECT (SELECT 1.5,'c','a') = ROW(1.5,2,'a'); +-- error 1239 +SELECT (SELECT * FROM (SELECT 'test' a,'test' b) a); + create table t1 (a int); create table t2 (a int, b int); create table t3 (a int); |