Skip to content

Commit 8df787d

Browse files
elenstelenst
committed
Follow-up for 54db0be (Added Max_index_length and Temporary)
1 parent 4074c74 commit 8df787d

File tree

8 files changed

+61
-55
lines changed

8 files changed

+61
-55
lines changed

‎mysql-test/suite/storage_engine/autoincrement.result

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ LAST_INSERT_ID()
5151
5
5252
SET sql_mode = '<INITIAL_SQL_MODE>';
5353
SHOW TABLE STATUS FROM test LIKE 't1';
54-
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
55-
t1 <STORAGE_ENGINE> # # # # # # # # 6 # # # # # # #
54+
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
55+
t1 <STORAGE_ENGINE> # # # # # # # # 6 # # # # # # # # N
5656
INSERT INTO t1 (a,b) VALUES (6,'g'),(7,'h');
5757
SELECT LAST_INSERT_ID();
5858
LAST_INSERT_ID()
5959
5
6060
SHOW TABLE STATUS FROM test LIKE 't1';
61-
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
62-
t1 # # # # # # # # # 8 # # # # # # #
61+
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
62+
t1 # # # # # # # # # 8 # # # # # # # # N
6363
INSERT INTO t1 (a,b) VALUES (NULL,'i'),(9,'j');
6464
SELECT a,b FROM t1 ORDER BY a;
6565
a b
@@ -77,12 +77,12 @@ SELECT LAST_INSERT_ID();
7777
LAST_INSERT_ID()
7878
8
7979
SHOW TABLE STATUS FROM test LIKE 't1';
80-
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
81-
t1 # # # # # # # # # 10 # # # # # # #
80+
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
81+
t1 # # # # # # # # # 10 # # # # # # # # N
8282
INSERT INTO t1 (a,b) VALUES (20,'k');
8383
SHOW TABLE STATUS FROM test LIKE 't1';
84-
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
85-
t1 # # # # # # # # # 21 # # # # # # #
84+
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
85+
t1 # # # # # # # # # 21 # # # # # # # # N
8686
INSERT INTO t1 (a,b) VALUES (NULL,'l');
8787
SELECT a,b FROM t1 ORDER BY a;
8888
a b
@@ -102,8 +102,8 @@ SELECT LAST_INSERT_ID();
102102
LAST_INSERT_ID()
103103
21
104104
SHOW TABLE STATUS FROM test LIKE 't1';
105-
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
106-
t1 # # # # # # # # # 22 # # # # # # #
105+
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
106+
t1 # # # # # # # # # 22 # # # # # # # # N
107107
INSERT INTO t1 (a,b) VALUES (-5,'m');
108108
SELECT a,b FROM t1 ORDER BY a;
109109
a b

‎mysql-test/suite/storage_engine/autoincrement.test

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,37 +50,37 @@ if (!$mysql_errname)
5050
# SHOW TABLE STATUS shows the auto-increment value in column 11,
5151
# that's all we need here and further
5252
--source mask_engine.inc
53-
--replace_column 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
53+
--replace_column 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 #
5454
SHOW TABLE STATUS FROM test LIKE 't1';
5555

5656
# Mix of automatic and explicit values
5757

5858
INSERT INTO t1 (a,b) VALUES (6,'g'),(7,'h');
5959
SELECT LAST_INSERT_ID();
6060

61-
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
61+
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 #
6262
SHOW TABLE STATUS FROM test LIKE 't1';
6363

6464

6565
INSERT INTO t1 (a,b) VALUES (NULL,'i'),(9,'j');
6666
SELECT a,b FROM t1 ORDER BY a;
6767
SELECT LAST_INSERT_ID();
6868

69-
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
69+
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 #
7070
SHOW TABLE STATUS FROM test LIKE 't1';
7171

7272
# Creating a gap in the sequence
7373

7474
INSERT INTO t1 (a,b) VALUES (20,'k');
7575

76-
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
76+
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 #
7777
SHOW TABLE STATUS FROM test LIKE 't1';
7878

7979
INSERT INTO t1 (a,b) VALUES (NULL,'l');
8080
SELECT a,b FROM t1 ORDER BY a;
8181
SELECT LAST_INSERT_ID();
8282

83-
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
83+
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 #
8484
SHOW TABLE STATUS FROM test LIKE 't1';
8585

8686
# Negative values: we will try to insert one just to check that it does not cause a crash,

‎mysql-test/suite/storage_engine/show_table_status.result

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Collation latin1_swedish_ci
2323
Checksum NULL
2424
Create_options
2525
Comment
26+
Max_index_length ###
27+
Temporary N
2628
Name t2
2729
Engine <STORAGE_ENGINE>
2830
Version 10
@@ -41,6 +43,8 @@ Collation latin1_swedish_ci
4143
Checksum NULL
4244
Create_options
4345
Comment
46+
Max_index_length ###
47+
Temporary N
4448
Name t3
4549
Engine <STORAGE_ENGINE>
4650
Version 10
@@ -59,4 +63,6 @@ Collation utf8_general_ci
5963
Checksum NULL
6064
Create_options
6165
Comment
66+
Max_index_length ###
67+
Temporary N
6268
DROP TABLE t1, t2, t3;

‎mysql-test/suite/storage_engine/show_table_status.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ INSERT INTO t2 (a,b) VALUES (1,'bar');
2222
--let $table_options = CHARACTER SET utf8
2323
--source create_table.inc
2424

25-
--replace_column 2 <STORAGE_ENGINE> 4 ### 6 ### 7 ### 8 ### 9 ### 10 ### 12 ### 13 ###
25+
--replace_column 2 <STORAGE_ENGINE> 4 ### 6 ### 7 ### 8 ### 9 ### 10 ### 12 ### 13 ### 19 ###
2626
--query_vertical SHOW TABLE STATUS WHERE name IN ( 't1', 't2', 't3' )
2727
DROP TABLE t1, t2, t3;
2828

‎mysql-test/suite/storage_engine/truncate_table.result

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ a b
88
DROP TABLE t1;
99
CREATE TABLE t1 (a <INT_COLUMN> KEY AUTO_INCREMENT, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
1010
SHOW TABLE STATUS LIKE 't1';
11-
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
12-
t1 # # # # # # # # # 1 # # # # # # #
11+
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
12+
t1 # # # # # # # # # 1 # # # # # # # # N
1313
INSERT INTO t1 (c) VALUES ('a'),('b'),('c');
1414
SHOW TABLE STATUS LIKE 't1';
15-
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
16-
t1 # # # # # # # # # 4 # # # # # # #
15+
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
16+
t1 # # # # # # # # # 4 # # # # # # # # N
1717
TRUNCATE TABLE t1;
1818
SHOW TABLE STATUS LIKE 't1';
19-
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
20-
t1 # # # # # # # # # 1 # # # # # # #
19+
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
20+
t1 # # # # # # # # # 1 # # # # # # # # N
2121
INSERT INTO t1 (c) VALUES ('d');
2222
SHOW TABLE STATUS LIKE 't1';
23-
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
24-
t1 # # # # # # # # # 2 # # # # # # #
23+
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
24+
t1 # # # # # # # # # 2 # # # # # # # # N
2525
SELECT a,c FROM t1;
2626
a c
2727
1 d

‎mysql-test/suite/storage_engine/truncate_table.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ if ($mysql_errname)
3636
}
3737
if (!$mysql_errname)
3838
{
39-
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
39+
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 #
4040
SHOW TABLE STATUS LIKE 't1';
4141

4242
INSERT INTO t1 (c) VALUES ('a'),('b'),('c');
43-
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
43+
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 #
4444
SHOW TABLE STATUS LIKE 't1';
4545

4646
TRUNCATE TABLE t1;
47-
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
47+
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 #
4848
SHOW TABLE STATUS LIKE 't1';
4949

5050
INSERT INTO t1 (c) VALUES ('d');
51-
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 #
51+
--replace_column 2 # 3 # 4 # 5 # 6 # 7 # 8 # 9 # 10 # 12 # 13 # 14 # 15 # 16 # 17 # 18 # 19 #
5252
SHOW TABLE STATUS LIKE 't1';
5353

5454
SELECT a,c FROM t1;

‎storage/myisammrg/mysql-test/storage_engine/autoincrement.rdiff

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,40 @@
1212
@@ -52,14 +52,14 @@
1313
SET sql_mode = '<INITIAL_SQL_MODE>';
1414
SHOW TABLE STATUS FROM test LIKE 't1';
15-
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
16-
-t1 <STORAGE_ENGINE> # # # # # # # # 6 # # # # # # #
17-
+t1 <STORAGE_ENGINE> # # # # # # # # 0 # # # # # # #
15+
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
16+
-t1 <STORAGE_ENGINE> # # # # # # # # 6 # # # # # # # # N
17+
+t1 <STORAGE_ENGINE> # # # # # # # # 0 # # # # # # # # N
1818
INSERT INTO t1 (a,b) VALUES (6,'g'),(7,'h');
1919
SELECT LAST_INSERT_ID();
2020
LAST_INSERT_ID()
2121
5
2222
SHOW TABLE STATUS FROM test LIKE 't1';
23-
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
24-
-t1 # # # # # # # # # 8 # # # # # # #
25-
+t1 # # # # # # # # # 0 # # # # # # #
23+
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
24+
-t1 # # # # # # # # # 8 # # # # # # # # N
25+
+t1 # # # # # # # # # 0 # # # # # # # # N
2626
INSERT INTO t1 (a,b) VALUES (NULL,'i'),(9,'j');
2727
SELECT a,b FROM t1 ORDER BY a;
2828
a b
2929
@@ -78,11 +78,11 @@
3030
8
3131
SHOW TABLE STATUS FROM test LIKE 't1';
32-
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
33-
-t1 # # # # # # # # # 10 # # # # # # #
34-
+t1 # # # # # # # # # 0 # # # # # # #
32+
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
33+
-t1 # # # # # # # # # 10 # # # # # # # # N
34+
+t1 # # # # # # # # # 0 # # # # # # # # N
3535
INSERT INTO t1 (a,b) VALUES (20,'k');
3636
SHOW TABLE STATUS FROM test LIKE 't1';
37-
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
38-
-t1 # # # # # # # # # 21 # # # # # # #
39-
+t1 # # # # # # # # # 0 # # # # # # #
37+
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
38+
-t1 # # # # # # # # # 21 # # # # # # # # N
39+
+t1 # # # # # # # # # 0 # # # # # # # # N
4040
INSERT INTO t1 (a,b) VALUES (NULL,'l');
4141
SELECT a,b FROM t1 ORDER BY a;
4242
a b
4343
@@ -103,7 +103,7 @@
4444
21
4545
SHOW TABLE STATUS FROM test LIKE 't1';
46-
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
47-
-t1 # # # # # # # # # 22 # # # # # # #
48-
+t1 # # # # # # # # # 0 # # # # # # #
46+
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
47+
-t1 # # # # # # # # # 22 # # # # # # # # N
48+
+t1 # # # # # # # # # 0 # # # # # # # # N
4949
INSERT INTO t1 (a,b) VALUES (-5,'m');
5050
SELECT a,b FROM t1 ORDER BY a;
5151
a b

‎storage/myisammrg/mysql-test/storage_engine/truncate_table.rdiff

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
@@ -9,19 +9,19 @@
44
CREATE TABLE t1 (a <INT_COLUMN> KEY AUTO_INCREMENT, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
55
SHOW TABLE STATUS LIKE 't1';
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
7-
-t1 # # # # # # # # # 1 # # # # # # #
8-
+t1 # # # # # # # # # 0 # # # # # # #
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
7+
-t1 # # # # # # # # # 1 # # # # # # # # N
8+
+t1 # # # # # # # # # 0 # # # # # # # # N
99
INSERT INTO t1 (c) VALUES ('a'),('b'),('c');
1010
SHOW TABLE STATUS LIKE 't1';
11-
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
12-
-t1 # # # # # # # # # 4 # # # # # # #
13-
+t1 # # # # # # # # # 0 # # # # # # #
11+
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
12+
-t1 # # # # # # # # # 4 # # # # # # # # N
13+
+t1 # # # # # # # # # 0 # # # # # # # # N
1414
TRUNCATE TABLE t1;
1515
SHOW TABLE STATUS LIKE 't1';
16-
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
17-
-t1 # # # # # # # # # 1 # # # # # # #
18-
+t1 # # # # # # # # # 0 # # # # # # #
16+
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
17+
-t1 # # # # # # # # # 1 # # # # # # # # N
18+
+t1 # # # # # # # # # 0 # # # # # # # # N
1919
INSERT INTO t1 (c) VALUES ('d');
2020
SHOW TABLE STATUS LIKE '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
22-
-t1 # # # # # # # # # 2 # # # # # # #
23-
+t1 # # # # # # # # # 0 # # # # # # #
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
22+
-t1 # # # # # # # # # 2 # # # # # # # # N
23+
+t1 # # # # # # # # # 0 # # # # # # # # N
2424
SELECT a,c FROM t1;
2525
a c
2626
1 d

0 commit comments

Comments
 (0)