Added Max_index_length and Temporary to SHOW TABLE STATUSbb-10.2-ext2

- Max_index_length is supported by MyISAM and Aria tables.
- Temporary is a placeholder to signal that a table is a
  temporary table. For the moment this is always "N", except
  "Y" for generated information_schema tables and NULL for
  views. Full temporary table support will be done in another task.
  (No reason to have to update a lot of result files twice in a row)

9 files changed, 25 insertions, 32 deletions

diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test
index 79a01d5e0c4..90af266c87b 100644
--- a/mysql-test/t/alter_table.test
+++ b/mysql-test/t/alter_table.test
@@ -269,15 +269,15 @@ drop table if exists t1, t2;
 
 create table t1 (a int, b int, c int, d int, e int, f int, g int, h int,i int, primary key (a,b,c,d,e,f,g,i,h)) engine=MyISAM;
 insert ignore into t1 (a) values(1);
---replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X
+--replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X 19 X
 show table status like 't1';
 alter table t1 modify a int;
---replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X
+--replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X 19 X
 show table status like 't1';
 drop table t1;
 create table t1 (a int not null, b int not null, c int not null, d int not null, e int not null, f int not null, g int not null, h int not null,i int not null, primary key (a,b,c,d,e,f,g,i,h)) engine=MyISAM;
 insert ignore into t1 (a) values(1);
---replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X
+--replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X 19 X
 show table status like 't1';
 drop table t1;
 
diff --git a/mysql-test/t/frm_bad_row_type-7333.test b/mysql-test/t/frm_bad_row_type-7333.test
index 5100a85cb22..916550402c9 100644
--- a/mysql-test/t/frm_bad_row_type-7333.test
+++ b/mysql-test/t/frm_bad_row_type-7333.test
@@ -9,6 +9,6 @@ copy_file std_data/bad_row_type.frm $datadir/test/bad_row_type.frm;
 
 select * from bad_row_type;
 show create table bad_row_type;
-replace_column 12 x 13 x;
+replace_column 12 x 13 x 19 x;
 show table status like 'bad_row_type';
 drop table bad_row_type;
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index 417390dcafe..9799e65e76e 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -78,7 +78,7 @@ select * from information_schema.STATISTICS where TABLE_SCHEMA = "mysqltest";
 show keys from t3 where Key_name = "a_data";
 
 show tables like 't%';
---replace_column 8 # 12 # 13 #
+--replace_column 8 # 12 # 13 # 19 #
 show table status;
 show full columns from t3 like "a%";
 show full columns from mysql.db like "Insert%";
@@ -706,7 +706,7 @@ drop table t1;
 CREATE TABLE t1 (a int);
 CREATE TABLE t2 (b int);
 
---replace_column 8 # 12 # 13 #
+--replace_column 8 # 12 # 13 # 19 #
 SHOW TABLE STATUS FROM test
   WHERE name IN ( SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
                     WHERE TABLE_SCHEMA='test' AND TABLE_TYPE='BASE TABLE');
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index f5771305dc4..edc4a364ad9 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -1461,9 +1461,7 @@ DROP TABLE t1, m1;
 #             and there is incorrect merge table
 #
 CREATE TABLE tm1 (c1 INT) ENGINE=MRG_MYISAM UNION=(t1) INSERT_METHOD=FIRST;
---replace_column 8 # 9 # 10 # 11 # 12 # 13 # 14 # 15 # 16 # 17 # 19 # 20 #
-SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE
-TABLE_SCHEMA = 'test' and TABLE_NAME='tm1';
+SELECT table_schema, table_name, table_type, engine, version, row_format, table_comment FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test' and TABLE_NAME='tm1';
 
 DROP TABLE tm1;
 
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 1407e9fcf98..450868721cd 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -786,13 +786,11 @@ INSERT INTO t1 VALUES
 #
 SELECT _id FROM t1;
 DELETE FROM t1 WHERE _id < 8;
---replace_column 6 # 7 # 8 # 9 # 11 # 12 # 13 # 14 # 15 # 16 #
-SHOW TABLE STATUS LIKE 't1';
+SELECT table_name, engine, version, row_format, Table_rows, Data_free, create_options, table_comment FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test' and TABLE_NAME='t1';
 CHECK TABLE t1 EXTENDED;
 OPTIMIZE TABLE t1;
 CHECK TABLE t1 EXTENDED;
---replace_column 6 # 7 # 8 # 9 # 11 # 12 # 13 # 14 # 15 # 16 #
-SHOW TABLE STATUS LIKE 't1';
+SELECT table_name, engine, version, row_format, Table_rows, Data_free, create_options, table_comment FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test' and TABLE_NAME='t1';
 SELECT _id FROM t1;
 DROP TABLE t1;
 #
@@ -828,13 +826,11 @@ INSERT INTO t1 VALUES
 #
 SELECT _id FROM t1;
 DELETE FROM t1 WHERE _id < 8;
---replace_column 6 # 7 # 8 # 9 # 11 # 12 # 13 # 14 # 15 # 16 #
-SHOW TABLE STATUS LIKE 't1';
+SELECT table_name, engine, version, row_format, Table_rows, Data_free, create_options, table_comment FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test' and TABLE_NAME='t1';
 CHECK TABLE t1 EXTENDED;
 REPAIR TABLE t1 QUICK;
 CHECK TABLE t1 EXTENDED;
---replace_column 6 # 7 # 8 # 9 # 11 # 12 # 13 # 14 # 15 # 16 #
-SHOW TABLE STATUS LIKE 't1';
+SELECT table_name, engine, version, row_format, Table_rows, Data_free, create_options, table_comment FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test' and TABLE_NAME='t1';
 SELECT _id FROM t1;
 DROP TABLE t1;
 #
@@ -864,8 +860,7 @@ DROP TABLE t1;
 # Bug#24607 - MyISAM pointer size determined incorrectly
 #
 CREATE TABLE t1 (c1 TEXT) AVG_ROW_LENGTH=70100 MAX_ROWS=4100100100;
---replace_column 5 X 6 X 7 X 9 X 10 X 11 X 12 X 13 X 14 X 16 X
-SHOW TABLE STATUS LIKE 't1';
+SELECT table_name, engine, version, row_format, max_data_length, max_index_length, create_options, table_comment FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'test' and TABLE_NAME='t1';
 DROP TABLE t1;
 
 #
@@ -1148,22 +1143,22 @@ DROP TABLE t1;
 # Bug#4692 - DISABLE/ENABLE KEYS waste a space
 #
 CREATE TABLE t1 (c1 INT, c2 INT, UNIQUE INDEX (c1), INDEX (c2)) ENGINE=MYISAM;
---replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 #
+--replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 # 19 #
 SHOW TABLE STATUS LIKE 't1';
 INSERT INTO t1 VALUES (1,1);
---replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 #
+--replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 # 19 #
 SHOW TABLE STATUS LIKE 't1';
 ALTER TABLE t1 DISABLE KEYS;
---replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 #
+--replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 # 19 #
 SHOW TABLE STATUS LIKE 't1';
 ALTER TABLE t1 ENABLE KEYS;
---replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 #
+--replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 # 19 #
 SHOW TABLE STATUS LIKE 't1';
 ALTER TABLE t1 DISABLE KEYS;
---replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 #
+--replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 # 19 #
 SHOW TABLE STATUS LIKE 't1';
 ALTER TABLE t1 ENABLE KEYS;
---replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 #
+--replace_column 6 # 7 # 8 # 10 # 11 # 12 # 13 # 14 # 15 # 16 # 19 #
 SHOW TABLE STATUS LIKE 't1';
 #--exec ls -log var/master-data/test/t1.MYI
 #--exec myisamchk -dvv var/master-data/test/t1.MYI
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test
index 9dfab0f07ba..01a0164722d 100644
--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/t/ps_1general.test
@@ -306,13 +306,13 @@ prepare stmt4 from ' show index from t2 from test ';
 execute stmt4;
 prepare stmt4 from ' show table status from test like ''t2%'' ';
 # egalize date and time values
---replace_column 8 # 12 # 13 # 14 #
+--replace_column 8 # 12 # 13 # 14 # 19 #
 # Bug#4288 : prepared statement 'show table status ..', wrong output on execute
 execute stmt4;
 # try the same with the big table
 prepare stmt4 from ' show table status from test like ''t9%'' ';
 # egalize date and time values
---replace_column 8 # 12 # 13 # 14 #
+--replace_column 8 # 12 # 13 # 14 # 19 #
 # Bug#4288
 execute stmt4;
 prepare stmt4 from ' show status like ''Threads_running'' ';
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index e8d5f9fa445..52ef4aa2111 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -2229,7 +2229,7 @@ drop table t1,t2;
 create table t1 (f1 int not null auto_increment primary key, f2 varchar(10));
 create table t11 like t1;
 insert into t1 values(1,""),(2,"");
---replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X
+--replace_column 7 X 8 X 9 X 10 X 11 X 12 X 13 X 14 X 19 X
 show table status like 't1%';
 select 123 as a from t1 where f1 is null;
 drop table t1,t11;
diff --git a/mysql-test/t/show_bad_definer-5553.test b/mysql-test/t/show_bad_definer-5553.test
index c5b6f1b3d10..7c7f253ae7d 100644
--- a/mysql-test/t/show_bad_definer-5553.test
+++ b/mysql-test/t/show_bad_definer-5553.test
@@ -7,6 +7,6 @@ create database mysqltest1; # all-open privileges on test db desroy the test
 use mysqltest1;
 create table t1(id int primary key);
 create definer=unknownuser@'%' sql security definer view v1 as select t1.id from t1 group by t1.id;
---replace_column 8 # 12 # 13 #
+--replace_column 8 # 12 # 13 # 19 #
 show table status;
 drop database mysqltest1;
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index a8d0ac836ae..2d8f98f4d5f 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -87,7 +87,7 @@ explain extended select c from v6;
 # show table/table status test
 show tables;
 show full tables;
---replace_column 8 # 12 # 13 # 14 #
+--replace_column 8 # 12 # 13 # 14 # 19 #
 show table status;
 
 drop view v1,v2,v3,v4,v5,v6;
@@ -738,7 +738,7 @@ create view v1 as select x1() from t1;
 drop function x1;
 -- error ER_VIEW_INVALID
 select * from v1;
---replace_column 8 # 12 # 13 #
+--replace_column 8 # 12 # 13 # 19 #
 show table status;
 drop view v1;
 drop table t1;
@@ -751,7 +751,7 @@ create view v1 as select a from t1;
 alter table t1 change a aa int;
 --error ER_VIEW_INVALID
 select * from v1;
---replace_column 8 # 12 # 13 #
+--replace_column 8 # 12 # 13 # 19 #
 show table status;
 show create view v1;
 drop view v1;