diff options
8 files changed, 61 insertions, 55 deletions
diff --git a/mysql-test/suite/storage_engine/autoincrement.result b/mysql-test/suite/storage_engine/autoincrement.result index 44cb8650441..541486e44de 100644 --- a/mysql-test/suite/storage_engine/autoincrement.result +++ b/mysql-test/suite/storage_engine/autoincrement.result @@ -51,15 +51,15 @@ LAST_INSERT_ID() 5 SET sql_mode = '<INITIAL_SQL_MODE>'; SHOW TABLE STATUS FROM test LIKE 't1'; -Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 <STORAGE_ENGINE> # # # # # # # # 6 # # # # # # # +Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +t1 <STORAGE_ENGINE> # # # # # # # # 6 # # # # # # # # N INSERT INTO t1 (a,b) VALUES (6,'g'),(7,'h'); SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 5 SHOW TABLE STATUS FROM test LIKE 't1'; -Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 # # # # # # # # # 8 # # # # # # # +Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +t1 # # # # # # # # # 8 # # # # # # # # N INSERT INTO t1 (a,b) VALUES (NULL,'i'),(9,'j'); SELECT a,b FROM t1 ORDER BY a; a b @@ -77,12 +77,12 @@ SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 8 SHOW TABLE STATUS FROM test LIKE 't1'; -Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 # # # # # # # # # 10 # # # # # # # +Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +t1 # # # # # # # # # 10 # # # # # # # # N INSERT INTO t1 (a,b) VALUES (20,'k'); SHOW TABLE STATUS FROM test LIKE 't1'; -Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 # # # # # # # # # 21 # # # # # # # +Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +t1 # # # # # # # # # 21 # # # # # # # # N INSERT INTO t1 (a,b) VALUES (NULL,'l'); SELECT a,b FROM t1 ORDER BY a; a b @@ -102,8 +102,8 @@ SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 21 SHOW TABLE STATUS FROM test LIKE 't1'; -Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 # # # # # # # # # 22 # # # # # # # +Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +t1 # # # # # # # # # 22 # # # # # # # # N INSERT INTO t1 (a,b) VALUES (-5,'m'); SELECT a,b FROM t1 ORDER BY a; a b diff --git a/mysql-test/suite/storage_engine/autoincrement.test b/mysql-test/suite/storage_engine/autoincrement.test index ddb0ab1b464..1ca0b650039 100644 --- a/mysql-test/suite/storage_engine/autoincrement.test +++ b/mysql-test/suite/storage_engine/autoincrement.test @@ -50,7 +50,7 @@ if (!$mysql_errname) # SHOW TABLE STATUS shows the auto-increment value in column 11, # that's all we need here and further --source mask_engine.inc - --replace_column 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # + --replace_column 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 # SHOW TABLE STATUS FROM test LIKE 't1'; # Mix of automatic and explicit values @@ -58,7 +58,7 @@ if (!$mysql_errname) INSERT INTO t1 (a,b) VALUES (6,'g'),(7,'h'); SELECT LAST_INSERT_ID(); - --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # + --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 # SHOW TABLE STATUS FROM test LIKE 't1'; @@ -66,21 +66,21 @@ if (!$mysql_errname) SELECT a,b FROM t1 ORDER BY a; SELECT LAST_INSERT_ID(); - --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # + --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 # SHOW TABLE STATUS FROM test LIKE 't1'; # Creating a gap in the sequence INSERT INTO t1 (a,b) VALUES (20,'k'); - --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # + --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 # SHOW TABLE STATUS FROM test LIKE 't1'; INSERT INTO t1 (a,b) VALUES (NULL,'l'); SELECT a,b FROM t1 ORDER BY a; SELECT LAST_INSERT_ID(); - --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # + --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 # SHOW TABLE STATUS FROM test LIKE 't1'; # Negative values: we will try to insert one just to check that it does not cause a crash, diff --git a/mysql-test/suite/storage_engine/show_table_status.result b/mysql-test/suite/storage_engine/show_table_status.result index 98de48f816b..b020bbe6a00 100644 --- a/mysql-test/suite/storage_engine/show_table_status.result +++ b/mysql-test/suite/storage_engine/show_table_status.result @@ -23,6 +23,8 @@ Collation latin1_swedish_ci Checksum NULL Create_options Comment +Max_index_length ### +Temporary N Name t2 Engine <STORAGE_ENGINE> Version 10 @@ -41,6 +43,8 @@ Collation latin1_swedish_ci Checksum NULL Create_options Comment +Max_index_length ### +Temporary N Name t3 Engine <STORAGE_ENGINE> Version 10 @@ -59,4 +63,6 @@ Collation utf8_general_ci Checksum NULL Create_options Comment +Max_index_length ### +Temporary N DROP TABLE t1, t2, t3; diff --git a/mysql-test/suite/storage_engine/show_table_status.test b/mysql-test/suite/storage_engine/show_table_status.test index 469d7e33a20..2fd5c6a706a 100644 --- a/mysql-test/suite/storage_engine/show_table_status.test +++ b/mysql-test/suite/storage_engine/show_table_status.test @@ -22,7 +22,7 @@ INSERT INTO t2 (a,b) VALUES (1,'bar'); --let $table_options = CHARACTER SET utf8 --source create_table.inc ---replace_column 2 <STORAGE_ENGINE> 4 ### 6 ### 7 ### 8 ### 9 ### 10 ### 12 ### 13 ### +--replace_column 2 <STORAGE_ENGINE> 4 ### 6 ### 7 ### 8 ### 9 ### 10 ### 12 ### 13 ### 19 ### --query_vertical SHOW TABLE STATUS WHERE name IN ( 't1', 't2', 't3' ) DROP TABLE t1, t2, t3; diff --git a/mysql-test/suite/storage_engine/truncate_table.result b/mysql-test/suite/storage_engine/truncate_table.result index d8dc5046442..eac58272e48 100644 --- a/mysql-test/suite/storage_engine/truncate_table.result +++ b/mysql-test/suite/storage_engine/truncate_table.result @@ -8,20 +8,20 @@ a b DROP TABLE t1; CREATE TABLE t1 (a <INT_COLUMN> KEY AUTO_INCREMENT, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; SHOW TABLE STATUS LIKE 't1'; -Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 # # # # # # # # # 1 # # # # # # # +Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +t1 # # # # # # # # # 1 # # # # # # # # N INSERT INTO t1 (c) VALUES ('a'),('b'),('c'); SHOW TABLE STATUS LIKE 't1'; -Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 # # # # # # # # # 4 # # # # # # # +Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +t1 # # # # # # # # # 4 # # # # # # # # N TRUNCATE TABLE t1; SHOW TABLE STATUS LIKE 't1'; -Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 # # # # # # # # # 1 # # # # # # # +Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +t1 # # # # # # # # # 1 # # # # # # # # N INSERT INTO t1 (c) VALUES ('d'); SHOW TABLE STATUS LIKE 't1'; -Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment -t1 # # # # # # # # # 2 # # # # # # # +Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +t1 # # # # # # # # # 2 # # # # # # # # N SELECT a,c FROM t1; a c 1 d diff --git a/mysql-test/suite/storage_engine/truncate_table.test b/mysql-test/suite/storage_engine/truncate_table.test index a9277b39619..6a6301f4be0 100644 --- a/mysql-test/suite/storage_engine/truncate_table.test +++ b/mysql-test/suite/storage_engine/truncate_table.test @@ -36,19 +36,19 @@ if ($mysql_errname) } if (!$mysql_errname) { - --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # + --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 # SHOW TABLE STATUS LIKE 't1'; INSERT INTO t1 (c) VALUES ('a'),('b'),('c'); - --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # + --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 # SHOW TABLE STATUS LIKE 't1'; TRUNCATE TABLE t1; - --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # + --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 # SHOW TABLE STATUS LIKE 't1'; INSERT INTO t1 (c) VALUES ('d'); - --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # + --replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 # SHOW TABLE STATUS LIKE 't1'; SELECT a,c FROM t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/autoincrement.rdiff b/storage/myisammrg/mysql-test/storage_engine/autoincrement.rdiff index 68264bdeb8d..cc04b800793 100644 --- a/storage/myisammrg/mysql-test/storage_engine/autoincrement.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/autoincrement.rdiff @@ -12,40 +12,40 @@ @@ -52,14 +52,14 @@ SET sql_mode = '<INITIAL_SQL_MODE>'; SHOW TABLE STATUS FROM test LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 <STORAGE_ENGINE> # # # # # # # # 6 # # # # # # # -+t1 <STORAGE_ENGINE> # # # # # # # # 0 # # # # # # # + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 <STORAGE_ENGINE> # # # # # # # # 6 # # # # # # # # N ++t1 <STORAGE_ENGINE> # # # # # # # # 0 # # # # # # # # N INSERT INTO t1 (a,b) VALUES (6,'g'),(7,'h'); SELECT LAST_INSERT_ID(); LAST_INSERT_ID() 5 SHOW TABLE STATUS FROM test LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 # # # # # # # # # 8 # # # # # # # -+t1 # # # # # # # # # 0 # # # # # # # + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 # # # # # # # # # 8 # # # # # # # # N ++t1 # # # # # # # # # 0 # # # # # # # # N INSERT INTO t1 (a,b) VALUES (NULL,'i'),(9,'j'); SELECT a,b FROM t1 ORDER BY a; a b @@ -78,11 +78,11 @@ 8 SHOW TABLE STATUS FROM test LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 # # # # # # # # # 10 # # # # # # # -+t1 # # # # # # # # # 0 # # # # # # # + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 # # # # # # # # # 10 # # # # # # # # N ++t1 # # # # # # # # # 0 # # # # # # # # N INSERT INTO t1 (a,b) VALUES (20,'k'); SHOW TABLE STATUS FROM test LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 # # # # # # # # # 21 # # # # # # # -+t1 # # # # # # # # # 0 # # # # # # # + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 # # # # # # # # # 21 # # # # # # # # N ++t1 # # # # # # # # # 0 # # # # # # # # N INSERT INTO t1 (a,b) VALUES (NULL,'l'); SELECT a,b FROM t1 ORDER BY a; a b @@ -103,7 +103,7 @@ 21 SHOW TABLE STATUS FROM test LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 # # # # # # # # # 22 # # # # # # # -+t1 # # # # # # # # # 0 # # # # # # # + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 # # # # # # # # # 22 # # # # # # # # N ++t1 # # # # # # # # # 0 # # # # # # # # N INSERT INTO t1 (a,b) VALUES (-5,'m'); SELECT a,b FROM t1 ORDER BY a; a b diff --git a/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff index bb2e5585910..e429bbdb177 100644 --- a/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff @@ -3,24 +3,24 @@ @@ -9,19 +9,19 @@ CREATE TABLE t1 (a <INT_COLUMN> KEY AUTO_INCREMENT, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>; SHOW TABLE STATUS LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 # # # # # # # # # 1 # # # # # # # -+t1 # # # # # # # # # 0 # # # # # # # + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 # # # # # # # # # 1 # # # # # # # # N ++t1 # # # # # # # # # 0 # # # # # # # # N INSERT INTO t1 (c) VALUES ('a'),('b'),('c'); SHOW TABLE STATUS LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 # # # # # # # # # 4 # # # # # # # -+t1 # # # # # # # # # 0 # # # # # # # + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 # # # # # # # # # 4 # # # # # # # # N ++t1 # # # # # # # # # 0 # # # # # # # # N TRUNCATE TABLE t1; SHOW TABLE STATUS LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 # # # # # # # # # 1 # # # # # # # -+t1 # # # # # # # # # 0 # # # # # # # + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 # # # # # # # # # 1 # # # # # # # # N ++t1 # # # # # # # # # 0 # # # # # # # # N INSERT INTO t1 (c) VALUES ('d'); SHOW TABLE STATUS LIKE 't1'; - Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment --t1 # # # # # # # # # 2 # # # # # # # -+t1 # # # # # # # # # 0 # # # # # # # + Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Max_index_length Temporary +-t1 # # # # # # # # # 2 # # # # # # # # N ++t1 # # # # # # # # # 0 # # # # # # # # N SELECT a,c FROM t1; a c 1 d |