diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-17 23:24:51 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-17 23:24:51 +0200 |
| commit | e4921f2159a279cfba37a9d3fbfa498141e81b69 (patch) | |
| tree | d2249b595529e043e6b4cbaed529829ac87aacfb /mysql-test/r/innodb.result | |
| parent | 11cbe4271c2f931562bdb5f496dcfa6ebd22760f (diff) | |
| download | mariadb-git-e4921f2159a279cfba37a9d3fbfa498141e81b69.tar.gz | |
Fix after merge
BitKeeper/etc/ignore:
Added libmysqld/sql_do.cc to the ignore list
include/m_string.h:
Fix for purify
libmysql/Makefile.shared:
Fix for purify
libmysqld/Makefile.am:
Fix for purify
sql/sql_handler.cc:
Cleanup
Diffstat (limited to 'mysql-test/r/innodb.result')
| -rw-r--r-- | mysql-test/r/innodb.result | 14 |
1 files changed, 7 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); |