diff options
| author | monty@hundin.mysql.fi <> | 2001-12-17 23:24:51 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-12-17 23:24:51 +0200 |
| commit | cb754eb5aa510eb0e5466ac2ed77f9b6b6e4b2bd (patch) | |
| tree | d2249b595529e043e6b4cbaed529829ac87aacfb /mysql-test | |
| parent | c298f03570692c4095e4d1100b88539a9836a3a2 (diff) | |
| download | mariadb-git-cb754eb5aa510eb0e5466ac2ed77f9b6b6e4b2bd.tar.gz | |
Fix after merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/innodb.result | 14 | ||||
| -rw-r--r-- | mysql-test/r/select.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/select.test | 6 |
3 files changed, 15 insertions, 7 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 770ecdb1ab6..5d3634376d8 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -140,13 +140,13 @@ id parent_id level 1015 102 2 explain select level from t1 where level=1; table type possible_keys key key_len ref rows Extra -t1 index level level 1 NULL 39 where used; Using index +t1 ref level level 1 const 12 where used; Using index explain select level,id from t1 where level=1; table type possible_keys key key_len ref rows Extra -t1 index level level 1 NULL 39 where used; Using index +t1 ref level level 1 const 12 where used; Using index explain select level,id,parent_id from t1 where level=1; table type possible_keys key key_len ref rows Extra -t1 ALL level NULL NULL NULL 39 where used +t1 ref level level 1 const 12 where used select level,id from t1 where level=1; level id 1 1002 @@ -168,9 +168,9 @@ Table Op Msg_type Msg_text test.t1 optimize error The handler for the table doesn't support check/repair show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment -t1 0 PRIMARY 1 id A 2 NULL NULL -t1 1 parent_id 1 parent_id A 2 NULL NULL -t1 1 level 1 level A 2 NULL NULL +t1 0 PRIMARY 1 id A 87 NULL NULL +t1 1 parent_id 1 parent_id A 21 NULL NULL +t1 1 level 1 level A 4 NULL NULL drop table t1; CREATE TABLE t1 ( gesuchnr int(11) DEFAULT '0' NOT NULL, @@ -727,7 +727,7 @@ Table Op Msg_type Msg_text test.t1 optimize error The handler for the table doesn't support check/repair show keys from t1; Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment -t1 0 PRIMARY 1 a A 2 NULL NULL +t1 0 PRIMARY 1 a A 1 NULL NULL drop table t1; create table t1 (i int, j int ) TYPE=innodb; insert into t1 values (1,2); diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 0c298735d8b..702d4a6de03 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -3229,4 +3229,6 @@ Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_par t2 0 PRIMARY 1 auto A 1199 NULL NULL t2 0 fld1 1 fld1 A 1199 NULL NULL t2 1 fld3 1 fld3 A NULL NULL NULL +DO 1; +DO benchmark(100,1+1),1,1; drop table t4, t3,t2, t1; diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test index cdb6ee57e0f..ab4251fe536 100644 --- a/mysql-test/t/select.test +++ b/mysql-test/t/select.test @@ -1713,6 +1713,12 @@ show full columns from t2 from test like 's%'; show keys from t2; # +# Test of DO + +DO 1; +DO benchmark(100,1+1),1,1; + +# # Drop the test tables # |