diff --git a/.bzrignore b/.bzrignore index f497aa69ffd..5d5909ce4da 100644 --- a/.bzrignore +++ b/.bzrignore @@ -530,3 +530,4 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl +support-files/MacOSX/ReadMe.txt 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