Skip to content

Commit b92095f

Browse files
jhauglidjhauglid
committed
WL#13528: Remove integer display width from SHOW CREATE output
This patch changes SHOW CREATE and INFORMATION_SCHEMA output so that the display width attribute is no longer included for integer columns without ZEROFILL. Integer display width was deprecated in WL#13127. This change means that we no longer generate CREATE syntax that we have deprecated in cases where there is no behavior change. Since ZEROFILL still is supported, integer display with is still included for ZEROFILL columns. The changes apply to tables, views and stored routines and to SHOW CREATE, DESCRIBE statements and INFORMATION_SCHEMA queries. Change-Id: Ib63cdde95647b31fb0ed96d00614b690f8652ca2 Backport from mysql-trunk to mysql-8.0 of: (cherry picked from commit f040c85d07cc167052c378f29390d8036dadb344) (cherry picked from commit b7bc86699ac9383e33f3613dc70aa00a8678f0eb) (cherry picked from commit a8d6d9d0dd2f0fe5f55c1a54deec6821f35cd9da) (cherry picked from commit 29ff55beba2d8b9eeb29c7697c8280563bfb038d) (cherry picked from commit 75be1b9102b2bba31019233e9ceaaa55ef477a7c) (cherry picked from commit 8ed727601a5938299f32720632d6ec7ebe3b2470) Change-Id: I558e0c50a92f8cc5db8233577fe5bfa9c00ac8bd
1 parent e777a04 commit b92095f

File tree

967 files changed

+32145
-31962
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

967 files changed

+32145
-31962
lines changed

‎mysql-test/r/alter_table.result

+162-162
Large diffs are not rendered by default.

‎mysql-test/r/alter_table_myisam.result

+28-28
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_par
284284
t1 1 a 1 a A NULL NULL NULL YES BTREE disabled YES NULL
285285
desc t1;
286286
Field Type Null Key Default Extra
287-
a bigint(20) YES MUL NULL
287+
a bigint YES MUL NULL
288288
b char(10) YES NULL
289289
c decimal(10,2) YES NULL
290290
alter table t1 add d decimal(15,5);
@@ -373,14 +373,14 @@ CREATE INDEX i1 ON t1(a);
373373
SHOW CREATE TABLE t1;
374374
Table Create Table
375375
t1 CREATE TABLE `t1` (
376-
`a` int(11) DEFAULT NULL,
376+
`a` int DEFAULT NULL,
377377
KEY `i1` (`a`)
378378
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=FIXED
379379
DROP INDEX i1 ON t1;
380380
SHOW CREATE TABLE t1;
381381
Table Create Table
382382
t1 CREATE TABLE `t1` (
383-
`a` int(11) DEFAULT NULL
383+
`a` int DEFAULT NULL
384384
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=FIXED
385385
DROP TABLE t1;
386386
DROP TABLE IF EXISTS bug24219;
@@ -524,13 +524,13 @@ alter table t2 algorithm=inplace, rename key k to kk;
524524
show create table t1;
525525
Table Create Table
526526
t1 CREATE TABLE `t1` (
527-
`i` int(11) DEFAULT NULL,
527+
`i` int DEFAULT NULL,
528528
KEY `kk` (`i`)
529529
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
530530
show create table t2;
531531
Table Create Table
532532
t2 CREATE TABLE `t2` (
533-
`i` int(11) DEFAULT NULL,
533+
`i` int DEFAULT NULL,
534534
KEY `kk` (`i`)
535535
) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
536536
# So by default in-place algorithm should be chosen.
@@ -544,13 +544,13 @@ info: Records: 0 Duplicates: 0 Warnings: 0
544544
show create table t1;
545545
Table Create Table
546546
t1 CREATE TABLE `t1` (
547-
`i` int(11) DEFAULT NULL,
547+
`i` int DEFAULT NULL,
548548
KEY `kkk` (`i`)
549549
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
550550
show create table t2;
551551
Table Create Table
552552
t2 CREATE TABLE `t2` (
553-
`i` int(11) DEFAULT NULL,
553+
`i` int DEFAULT NULL,
554554
KEY `kkk` (`i`)
555555
) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
556556
# Copy algorithm should work as well.
@@ -559,13 +559,13 @@ alter table t2 algorithm=copy, rename key kkk to kkkk;
559559
show create table t1;
560560
Table Create Table
561561
t1 CREATE TABLE `t1` (
562-
`i` int(11) DEFAULT NULL,
562+
`i` int DEFAULT NULL,
563563
KEY `kkkk` (`i`)
564564
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
565565
show create table t2;
566566
Table Create Table
567567
t2 CREATE TABLE `t2` (
568-
`i` int(11) DEFAULT NULL,
568+
`i` int DEFAULT NULL,
569569
KEY `kkkk` (`i`)
570570
) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
571571
# When renaming is combined with other in-place operation
@@ -575,13 +575,13 @@ alter table t2 algorithm=inplace, rename key kkkk to k, alter column i set defau
575575
show create table t1;
576576
Table Create Table
577577
t1 CREATE TABLE `t1` (
578-
`i` int(11) DEFAULT '100',
578+
`i` int DEFAULT '100',
579579
KEY `k` (`i`)
580580
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
581581
show create table t2;
582582
Table Create Table
583583
t2 CREATE TABLE `t2` (
584-
`i` int(11) DEFAULT '100',
584+
`i` int DEFAULT '100',
585585
KEY `k` (`i`)
586586
) ENGINE=MEMORY DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
587587
# Combining with non-inplace operation results in the whole ALTER
@@ -852,8 +852,8 @@ ALTER TABLE t1 RENAME INDEX b TO w, ADD FOREIGN KEY (b) REFERENCES t1(a);
852852
SHOW CREATE TABLE t1;
853853
Table Create Table
854854
t1 CREATE TABLE `t1` (
855-
`a` int(11) NOT NULL,
856-
`b` int(11) DEFAULT NULL,
855+
`a` int NOT NULL,
856+
`b` int DEFAULT NULL,
857857
PRIMARY KEY (`a`),
858858
KEY `w` (`b`)
859859
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
@@ -864,7 +864,7 @@ CREATE TABLE t2(a INT, b VARCHAR(30), c FLOAT) ENGINE=MyIsam;
864864
SHOW CREATE TABLE t2;
865865
Table Create Table
866866
t2 CREATE TABLE `t2` (
867-
`a` int(11) DEFAULT NULL,
867+
`a` int DEFAULT NULL,
868868
`b` varchar(30) DEFAULT NULL,
869869
`c` float DEFAULT NULL
870870
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
@@ -873,7 +873,7 @@ ALTER TABLE t2 RENAME COLUMN a TO d, RENAME COLUMN b TO e, RENAME COLUMN c to f;
873873
SHOW CREATE TABLE t2;
874874
Table Create Table
875875
t2 CREATE TABLE `t2` (
876-
`d` int(11) DEFAULT NULL,
876+
`d` int DEFAULT NULL,
877877
`e` varchar(30) DEFAULT NULL,
878878
`f` float DEFAULT NULL
879879
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
@@ -887,7 +887,7 @@ ALTER TABLE t2 RENAME COLUMN d TO g;
887887
SHOW CREATE TABLE t2;
888888
Table Create Table
889889
t2 CREATE TABLE `t2` (
890-
`g` int(11) DEFAULT NULL,
890+
`g` int DEFAULT NULL,
891891
`e` varchar(30) DEFAULT NULL,
892892
`f` float DEFAULT NULL
893893
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
@@ -918,47 +918,47 @@ ALTER TABLE t1 ALTER COLUMN i SET DEFAULT 10, ALGORITHM=INSTANT;
918918
SHOW CREATE TABLE t1;
919919
Table Create Table
920920
t1 CREATE TABLE `t1` (
921-
`i` int(11) DEFAULT '10',
921+
`i` int DEFAULT '10',
922922
`j` enum('a','b') DEFAULT NULL,
923923
KEY `i` (`i`)
924924
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
925925
ALTER TABLE t1 ALTER COLUMN i DROP DEFAULT, ALGORITHM=INSTANT;
926926
SHOW CREATE TABLE t1;
927927
Table Create Table
928928
t1 CREATE TABLE `t1` (
929-
`i` int(11),
929+
`i` int,
930930
`j` enum('a','b') DEFAULT NULL,
931931
KEY `i` (`i`)
932932
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
933933
ALTER TABLE t1 MODIFY COLUMN j ENUM('a', 'b', 'c', 'd', 'e'), ALGORITHM=INSTANT;
934934
SHOW CREATE TABLE t1;
935935
Table Create Table
936936
t1 CREATE TABLE `t1` (
937-
`i` int(11),
937+
`i` int,
938938
`j` enum('a','b','c','d','e') DEFAULT NULL,
939939
KEY `i` (`i`)
940940
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
941941
ALTER TABLE t1 CHANGE COLUMN i k INT, ALGORITHM=INSTANT;
942942
SHOW CREATE TABLE t1;
943943
Table Create Table
944944
t1 CREATE TABLE `t1` (
945-
`k` int(11) DEFAULT NULL,
945+
`k` int DEFAULT NULL,
946946
`j` enum('a','b','c','d','e') DEFAULT NULL,
947947
KEY `i` (`k`)
948948
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
949949
ALTER TABLE t1 RENAME INDEX i TO k, ALGORITHM=INSTANT;
950950
SHOW CREATE TABLE t1;
951951
Table Create Table
952952
t1 CREATE TABLE `t1` (
953-
`k` int(11) DEFAULT NULL,
953+
`k` int DEFAULT NULL,
954954
`j` enum('a','b','c','d','e') DEFAULT NULL,
955955
KEY `k` (`k`)
956956
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
957957
ALTER TABLE t1 RENAME TO t2, ALGORITHM=INSTANT;
958958
SHOW CREATE TABLE t2;
959959
Table Create Table
960960
t2 CREATE TABLE `t2` (
961-
`k` int(11) DEFAULT NULL,
961+
`k` int DEFAULT NULL,
962962
`j` enum('a','b','c','d','e') DEFAULT NULL,
963963
KEY `k` (`k`)
964964
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
@@ -970,47 +970,47 @@ ALTER TABLE t2 RENAME TO t1, ALGORITHM=INPLACE;
970970
SHOW CREATE TABLE t1;
971971
Table Create Table
972972
t1 CREATE TABLE `t1` (
973-
`k` int(11) DEFAULT NULL,
973+
`k` int DEFAULT NULL,
974974
`j` enum('a','b','c','d','e') DEFAULT NULL,
975975
KEY `k` (`k`)
976976
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
977977
ALTER TABLE t1 ALTER COLUMN k SET DEFAULT 11, ALGORITHM=INPLACE;
978978
SHOW CREATE TABLE t1;
979979
Table Create Table
980980
t1 CREATE TABLE `t1` (
981-
`k` int(11) DEFAULT '11',
981+
`k` int DEFAULT '11',
982982
`j` enum('a','b','c','d','e') DEFAULT NULL,
983983
KEY `k` (`k`)
984984
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
985985
ALTER TABLE t1 ALTER COLUMN k DROP DEFAULT, ALGORITHM=INPLACE;
986986
SHOW CREATE TABLE t1;
987987
Table Create Table
988988
t1 CREATE TABLE `t1` (
989-
`k` int(11),
989+
`k` int,
990990
`j` enum('a','b','c','d','e') DEFAULT NULL,
991991
KEY `k` (`k`)
992992
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
993993
ALTER TABLE t1 MODIFY COLUMN j ENUM('a', 'b', 'c', 'd', 'e', 'f', 'g'), ALGORITHM=INPLACE;
994994
SHOW CREATE TABLE t1;
995995
Table Create Table
996996
t1 CREATE TABLE `t1` (
997-
`k` int(11),
997+
`k` int,
998998
`j` enum('a','b','c','d','e','f','g') DEFAULT NULL,
999999
KEY `k` (`k`)
10001000
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
10011001
ALTER TABLE t1 CHANGE COLUMN k i INT, ALGORITHM=INPLACE;
10021002
SHOW CREATE TABLE t1;
10031003
Table Create Table
10041004
t1 CREATE TABLE `t1` (
1005-
`i` int(11) DEFAULT NULL,
1005+
`i` int DEFAULT NULL,
10061006
`j` enum('a','b','c','d','e','f','g') DEFAULT NULL,
10071007
KEY `k` (`i`)
10081008
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
10091009
ALTER TABLE t1 RENAME INDEX k TO i, ALGORITHM=INPLACE;
10101010
SHOW CREATE TABLE t1;
10111011
Table Create Table
10121012
t1 CREATE TABLE `t1` (
1013-
`i` int(11) DEFAULT NULL,
1013+
`i` int DEFAULT NULL,
10141014
`j` enum('a','b','c','d','e','f','g') DEFAULT NULL,
10151015
KEY `i` (`i`)
10161016
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci

‎mysql-test/r/alter_table_partition.result

+7-7
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ALTER TABLE t1 ALGORITHM = COPY, LOCK = EXCLUSIVE, DROP PARTITION p4;
3030
SHOW CREATE TABLE t1;
3131
Table Create Table
3232
t1 CREATE TABLE `t1` (
33-
`id` int(11) NOT NULL AUTO_INCREMENT,
33+
`id` int NOT NULL AUTO_INCREMENT,
3434
`name` varchar(50) DEFAULT NULL,
3535
`purchased` date DEFAULT NULL,
3636
KEY `id` (`id`)
@@ -57,7 +57,7 @@ ALTER TABLE t2 ALGORITHM = COPY, LOCK = EXCLUSIVE, REBUILD PARTITION p2;
5757
SHOW CREATE TABLE t1;
5858
Table Create Table
5959
t1 CREATE TABLE `t1` (
60-
`id` int(11) NOT NULL AUTO_INCREMENT,
60+
`id` int NOT NULL AUTO_INCREMENT,
6161
`name` varchar(50) DEFAULT NULL,
6262
`purchased` date DEFAULT NULL,
6363
KEY `id` (`id`)
@@ -82,7 +82,7 @@ ALTER TABLE t2 ALGORITHM = COPY, LOCK = EXCLUSIVE, COALESCE PARTITION 1;
8282
SHOW CREATE TABLE t1;
8383
Table Create Table
8484
t1 CREATE TABLE `t1` (
85-
`id` int(11) NOT NULL AUTO_INCREMENT,
85+
`id` int NOT NULL AUTO_INCREMENT,
8686
`name` varchar(50) DEFAULT NULL,
8787
`purchased` date DEFAULT NULL,
8888
KEY `id` (`id`)
@@ -106,7 +106,7 @@ ALTER TABLE t1 ALGORITHM = INPLACE, LOCK = EXCLUSIVE, DROP PARTITION p4;
106106
SHOW CREATE TABLE t1;
107107
Table Create Table
108108
t1 CREATE TABLE `t1` (
109-
`id` int(11) NOT NULL AUTO_INCREMENT,
109+
`id` int NOT NULL AUTO_INCREMENT,
110110
`name` varchar(50) DEFAULT NULL,
111111
`purchased` date DEFAULT NULL,
112112
KEY `id` (`id`)
@@ -133,7 +133,7 @@ ALTER TABLE t2 ALGORITHM = INPLACE, LOCK = EXCLUSIVE, REBUILD PARTITION p2;
133133
SHOW CREATE TABLE t1;
134134
Table Create Table
135135
t1 CREATE TABLE `t1` (
136-
`id` int(11) NOT NULL AUTO_INCREMENT,
136+
`id` int NOT NULL AUTO_INCREMENT,
137137
`name` varchar(50) DEFAULT NULL,
138138
`purchased` date DEFAULT NULL,
139139
KEY `id` (`id`)
@@ -158,7 +158,7 @@ ALTER TABLE t2 ALGORITHM = INPLACE, LOCK = EXCLUSIVE, COALESCE PARTITION 1;
158158
SHOW CREATE TABLE t1;
159159
Table Create Table
160160
t1 CREATE TABLE `t1` (
161-
`id` int(11) NOT NULL AUTO_INCREMENT,
161+
`id` int NOT NULL AUTO_INCREMENT,
162162
`name` varchar(50) DEFAULT NULL,
163163
`purchased` date DEFAULT NULL,
164164
KEY `id` (`id`)
@@ -181,7 +181,7 @@ ALTER TABLE t1 ALGORITHM = INPLACE, LOCK = EXCLUSIVE, EXCHANGE PARTITION p0 WITH
181181
SHOW CREATE TABLE t1;
182182
Table Create Table
183183
t1 CREATE TABLE `t1` (
184-
`id` int(11) NOT NULL AUTO_INCREMENT,
184+
`id` int NOT NULL AUTO_INCREMENT,
185185
`name` varchar(50) DEFAULT NULL,
186186
`purchased` date DEFAULT NULL,
187187
KEY `id` (`id`)

‎mysql-test/r/archive.result

+3-3
Original file line numberDiff line numberDiff line change
@@ -11138,7 +11138,7 @@ ALTER TABLE t2 DROP COLUMN fld6;
1113811138
SHOW CREATE TABLE t2;
1113911139
Table Create Table
1114011140
t2 CREATE TABLE `t2` (
11141-
`auto` int(11) DEFAULT NULL,
11141+
`auto` int DEFAULT NULL,
1114211142
`fld1` int(6) unsigned zerofill NOT NULL DEFAULT '000000',
1114311143
`companynr` tinyint(2) unsigned zerofill NOT NULL DEFAULT '00',
1114411144
`fld3` char(30) NOT NULL DEFAULT '',
@@ -12677,9 +12677,9 @@ a b c
1267712677
SHOW CREATE TABLE t6;
1267812678
Table Create Table
1267912679
t6 CREATE TABLE `t6` (
12680-
`a` int(11) NOT NULL AUTO_INCREMENT,
12680+
`a` int NOT NULL AUTO_INCREMENT,
1268112681
`b` tinyblob,
12682-
`c` int(11) DEFAULT NULL,
12682+
`c` int DEFAULT NULL,
1268312683
KEY `a` (`a`)
1268412684
) ENGINE=ARCHIVE AUTO_INCREMENT=36 DEFAULT CHARSET=latin1
1268512685
DROP TABLE t1, t2, t4, t5, t6;

‎mysql-test/r/archive_bitfield.result

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ b bit(64)
66
show create table t1;
77
Table Create Table
88
t1 CREATE TABLE `t1` (
9-
`pk1` int(11) NOT NULL AUTO_INCREMENT,
9+
`pk1` int NOT NULL AUTO_INCREMENT,
1010
`b` bit(64) DEFAULT NULL,
1111
PRIMARY KEY (`pk1`)
1212
) ENGINE=ARCHIVE DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci

0 commit comments

Comments
 (0)