Improved ANALYZE TABLE a bit for small tables.

Docs/manual.texi:
  Updated changelog

1 files changed, 13 insertions, 2 deletions

diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 0e3447716a0..d4be1a6d25a 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -13,7 +13,7 @@ lock tables t1 read;
 check table t2,t1;
 show columns from t1;
 show full columns from t1;
-show keys from t1;
+show index from t1;
 drop table t1,t2;
 
 create table t1 (a int not null primary key, b int not null,c int not null, key(b,c));
@@ -25,7 +25,7 @@ insert into t1 values (5,5,5);
 check table t1 type=changed;
 check table t1 type=medium;
 check table t1 type=extended;
-show keys from t1;
+show index from t1;
 !$1062 insert into t1 values (5,5,5);
 optimize table t1;
 optimize table t1;
@@ -37,3 +37,14 @@ show variables like "this_doesn't_exists%";
 show table status from test like "this_doesn't_exists%";
 show databases;
 show databases like "test%";
+
+#
+# Check of show index
+#
+create table t1 (f1 int not null, f2 int not null, f3 int not null, f4 int not null, primary key(f1,f2,f3,f4));
+insert into t1 values (1,1,1,0),(1,1,2,0),(1,1,3,0),(1,2,1,0),(1,2,2,0),(1,2,3,0),(1,3,1,0),(1,3,2,0),(1,3,3,0),(1,1,1,1),(1,1,2,1),(1,1,3,1),(1,2,1,1),(1,2,2,1),(1,2,3,1),(1,3,1,1),(1,3,2,1),(1,3,3,1);
+analyze table t1;
+show index from t1;
+repair table t1;
+show index from t1;
+drop table t1;