summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorlenz@mysql.com <>2003-04-25 14:52:48 +0200
committerlenz@mysql.com <>2003-04-25 14:52:48 +0200
commit8534b43f70906aafb9a32b1313f5c4008678b174 (patch)
tree8eba1243116d9c155e57713b9081abb274142cf0 /mysql-test
parent4c749f6f3e8be5d2722b96a05a578766167d9151 (diff)
parent8f1098fa305c966b63a31d1774b7b70ed0165ccd (diff)
downloadmariadb-git-8534b43f70906aafb9a32b1313f5c4008678b174.tar.gz
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/innodb.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 293519604dd..5049dec9ef1 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -208,7 +208,7 @@ create index skr on t1 (a);
insert into t1 values (3,""), (4,"testing");
analyze table t1;
Table Op Msg_type Msg_text
-test.t1 analyze error The handler for the table doesn't support analyze
+test.t1 analyze status OK
show keys from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 1 skr 1 a A 3 NULL NULL YES BTREE
@@ -1227,10 +1227,10 @@ count(*)
29267
explain select a from t1 where a between 1 and 10000;
table type possible_keys key key_len ref rows Extra
-t1 range PRIMARY PRIMARY 4 NULL 14790 Using where; Using index
+t1 range PRIMARY PRIMARY 4 NULL 14745 Using where; Using index
explain select * from t1 where a between 1 and 10000;
table type possible_keys key key_len ref rows Extra
-t1 range PRIMARY PRIMARY 4 NULL 14790 Using where
+t1 range PRIMARY PRIMARY 4 NULL 14745 Using where
explain select * from t1 where c between 1 and 10000;
table type possible_keys key key_len ref rows Extra
t1 range c c 5 NULL 1 Using where