Skip to content

Commit b725a91

Browse files
vuvovavuvova
committed
MDEV-28253 Mysqldump - INVISIBLE column error
1 parent 7a03128 commit b725a91

File tree

8 files changed

+34
-11
lines changed

8 files changed

+34
-11
lines changed

‎mysql-test/main/show.result

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,15 @@ drop table t1;
5353
#
5454
# End of 10.2 tests
5555
#
56+
#
57+
# MDEV-28253 Mysqldump - INVISIBLE column error
58+
#
59+
create table t1 (a int, b datetime invisible on update now() without system versioning) with system versioning;
60+
desc t1;
61+
Field Type Null Key Default Extra
62+
a int(11) YES NULL
63+
b datetime YES NULL on update current_timestamp(), INVISIBLE, WITHOUT SYSTEM VERSIONING
64+
drop table t1;
65+
#
66+
# End of 10.3 tests
67+
#

‎mysql-test/main/show.test

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,14 @@ drop table t1;
4545
--echo #
4646
--echo # End of 10.2 tests
4747
--echo #
48+
49+
--echo #
50+
--echo # MDEV-28253 Mysqldump - INVISIBLE column error
51+
--echo #
52+
create table t1 (a int, b datetime invisible on update now() without system versioning) with system versioning;
53+
desc t1;
54+
drop table t1;
55+
56+
--echo #
57+
--echo # End of 10.3 tests
58+
--echo #

‎mysql-test/main/show_check.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -983,7 +983,7 @@ def information_schema COLUMNS COLUMNS CHARACTER_SET_NAME CHARACTER_SET_NAME 253
983983
def information_schema COLUMNS COLUMNS COLLATION_NAME COLLATION_NAME 253 96 0 Y 4096 0 33
984984
def information_schema COLUMNS COLUMNS COLUMN_TYPE COLUMN_TYPE 252 589815 7 N 4113 0 33
985985
def information_schema COLUMNS COLUMNS COLUMN_KEY COLUMN_KEY 253 9 3 N 4097 0 33
986-
def information_schema COLUMNS COLUMNS EXTRA EXTRA 253 90 0 N 4097 0 33
986+
def information_schema COLUMNS COLUMNS EXTRA EXTRA 253 240 0 N 4097 0 33
987987
def information_schema COLUMNS COLUMNS PRIVILEGES PRIVILEGES 253 240 31 N 4097 0 33
988988
def information_schema COLUMNS COLUMNS COLUMN_COMMENT COLUMN_COMMENT 253 3072 0 N 4097 0 33
989989
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT
@@ -1002,7 +1002,7 @@ def information_schema COLUMNS COLUMNS COLUMN_TYPE Type 252 589815 7 N 4113 0 33
10021002
def information_schema COLUMNS COLUMNS IS_NULLABLE Null 253 9 2 N 4097 0 33
10031003
def information_schema COLUMNS COLUMNS COLUMN_KEY Key 253 9 3 N 4097 0 33
10041004
def information_schema COLUMNS COLUMNS COLUMN_DEFAULT Default 252 589788 0 Y 4112 0 33
1005-
def information_schema COLUMNS COLUMNS EXTRA Extra 253 90 0 N 4097 0 33
1005+
def information_schema COLUMNS COLUMNS EXTRA Extra 253 240 0 N 4097 0 33
10061006
Field Type Null Key Default Extra
10071007
c int(11) NO PRI NULL
10081008
----------------------------------------------------------------

‎mysql-test/suite/funcs_1/r/is_columns.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ CHARACTER_SET_NAME varchar(32) YES NULL
4545
COLLATION_NAME varchar(32) YES NULL
4646
COLUMN_TYPE longtext NO NULL
4747
COLUMN_KEY varchar(3) NO NULL
48-
EXTRA varchar(30) NO NULL
48+
EXTRA varchar(80) NO NULL
4949
PRIVILEGES varchar(80) NO NULL
5050
COLUMN_COMMENT varchar(1024) NO NULL
5151
IS_GENERATED varchar(6) NO NULL
@@ -70,7 +70,7 @@ COLUMNS CREATE TEMPORARY TABLE `COLUMNS` (
7070
`COLLATION_NAME` varchar(32),
7171
`COLUMN_TYPE` longtext NOT NULL,
7272
`COLUMN_KEY` varchar(3) NOT NULL,
73-
`EXTRA` varchar(30) NOT NULL,
73+
`EXTRA` varchar(80) NOT NULL,
7474
`PRIVILEGES` varchar(80) NOT NULL,
7575
`COLUMN_COMMENT` varchar(1024) NOT NULL,
7676
`IS_GENERATED` varchar(6) NOT NULL,
@@ -95,7 +95,7 @@ CHARACTER_SET_NAME varchar(32) YES NULL
9595
COLLATION_NAME varchar(32) YES NULL
9696
COLUMN_TYPE longtext NO NULL
9797
COLUMN_KEY varchar(3) NO NULL
98-
EXTRA varchar(30) NO NULL
98+
EXTRA varchar(80) NO NULL
9999
PRIVILEGES varchar(80) NO NULL
100100
COLUMN_COMMENT varchar(1024) NO NULL
101101
IS_GENERATED varchar(6) NO NULL

‎mysql-test/suite/funcs_1/r/is_columns_is.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def information_schema COLUMNS COLUMN_NAME 4 NULL NO varchar 64 192 NULL NULL NU
7373
def information_schema COLUMNS COLUMN_TYPE 16 NULL NO longtext 4294967295 4294967295 NULL NULL NULL utf8 utf8_general_ci longtext select NEVER NULL
7474
def information_schema COLUMNS DATA_TYPE 8 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) select NEVER NULL
7575
def information_schema COLUMNS DATETIME_PRECISION 13 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned select NEVER NULL
76-
def information_schema COLUMNS EXTRA 18 NULL NO varchar 30 90 NULL NULL NULL utf8 utf8_general_ci varchar(30) select NEVER NULL
76+
def information_schema COLUMNS EXTRA 18 NULL NO varchar 80 240 NULL NULL NULL utf8 utf8_general_ci varchar(80) select NEVER NULL
7777
def information_schema COLUMNS GENERATION_EXPRESSION 22 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8 utf8_general_ci longtext select NEVER NULL
7878
def information_schema COLUMNS IS_GENERATED 21 NULL NO varchar 6 18 NULL NULL NULL utf8 utf8_general_ci varchar(6) select NEVER NULL
7979
def information_schema COLUMNS IS_NULLABLE 7 NULL NO varchar 3 9 NULL NULL NULL utf8 utf8_general_ci varchar(3) select NEVER NULL
@@ -619,7 +619,7 @@ NULL information_schema COLUMNS DATETIME_PRECISION bigint NULL NULL NULL NULL bi
619619
3.0000 information_schema COLUMNS COLLATION_NAME varchar 32 96 utf8 utf8_general_ci varchar(32)
620620
1.0000 information_schema COLUMNS COLUMN_TYPE longtext 4294967295 4294967295 utf8 utf8_general_ci longtext
621621
3.0000 information_schema COLUMNS COLUMN_KEY varchar 3 9 utf8 utf8_general_ci varchar(3)
622-
3.0000 information_schema COLUMNS EXTRA varchar 30 90 utf8 utf8_general_ci varchar(30)
622+
3.0000 information_schema COLUMNS EXTRA varchar 80 240 utf8 utf8_general_ci varchar(80)
623623
3.0000 information_schema COLUMNS PRIVILEGES varchar 80 240 utf8 utf8_general_ci varchar(80)
624624
3.0000 information_schema COLUMNS COLUMN_COMMENT varchar 1024 3072 utf8 utf8_general_ci varchar(1024)
625625
3.0000 information_schema COLUMNS IS_GENERATED varchar 6 18 utf8 utf8_general_ci varchar(6)

‎mysql-test/suite/funcs_1/r/is_columns_is_embedded.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def information_schema COLUMNS COLUMN_NAME 4 NULL NO varchar 64 192 NULL NULL NU
7373
def information_schema COLUMNS COLUMN_TYPE 16 NULL NO longtext 4294967295 4294967295 NULL NULL NULL utf8 utf8_general_ci longtext NEVER NULL
7474
def information_schema COLUMNS DATA_TYPE 8 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_general_ci varchar(64) NEVER NULL
7575
def information_schema COLUMNS DATETIME_PRECISION 13 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(21) unsigned NEVER NULL
76-
def information_schema COLUMNS EXTRA 18 NULL NO varchar 30 90 NULL NULL NULL utf8 utf8_general_ci varchar(30) NEVER NULL
76+
def information_schema COLUMNS EXTRA 18 NULL NO varchar 80 240 NULL NULL NULL utf8 utf8_general_ci varchar(80) NEVER NULL
7777
def information_schema COLUMNS GENERATION_EXPRESSION 22 NULL YES longtext 4294967295 4294967295 NULL NULL NULL utf8 utf8_general_ci longtext NEVER NULL
7878
def information_schema COLUMNS IS_GENERATED 21 NULL NO varchar 6 18 NULL NULL NULL utf8 utf8_general_ci varchar(6) NEVER NULL
7979
def information_schema COLUMNS IS_NULLABLE 7 NULL NO varchar 3 9 NULL NULL NULL utf8 utf8_general_ci varchar(3) NEVER NULL
@@ -619,7 +619,7 @@ NULL information_schema COLUMNS DATETIME_PRECISION bigint NULL NULL NULL NULL bi
619619
3.0000 information_schema COLUMNS COLLATION_NAME varchar 32 96 utf8 utf8_general_ci varchar(32)
620620
1.0000 information_schema COLUMNS COLUMN_TYPE longtext 4294967295 4294967295 utf8 utf8_general_ci longtext
621621
3.0000 information_schema COLUMNS COLUMN_KEY varchar 3 9 utf8 utf8_general_ci varchar(3)
622-
3.0000 information_schema COLUMNS EXTRA varchar 30 90 utf8 utf8_general_ci varchar(30)
622+
3.0000 information_schema COLUMNS EXTRA varchar 80 240 utf8 utf8_general_ci varchar(80)
623623
3.0000 information_schema COLUMNS PRIVILEGES varchar 80 240 utf8 utf8_general_ci varchar(80)
624624
3.0000 information_schema COLUMNS COLUMN_COMMENT varchar 1024 3072 utf8 utf8_general_ci varchar(1024)
625625
3.0000 information_schema COLUMNS IS_GENERATED varchar 6 18 utf8 utf8_general_ci varchar(6)

‎sql/sql_show.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9238,7 +9238,7 @@ ST_FIELD_INFO columns_fields_info[]=
92389238
OPEN_FRM_ONLY},
92399239
{"COLUMN_TYPE", 65535, MYSQL_TYPE_STRING, 0, 0, "Type", OPEN_FRM_ONLY},
92409240
{"COLUMN_KEY", 3, MYSQL_TYPE_STRING, 0, 0, "Key", OPEN_FRM_ONLY},
9241-
{"EXTRA", 30, MYSQL_TYPE_STRING, 0, 0, "Extra", OPEN_FRM_ONLY},
9241+
{"EXTRA", 80, MYSQL_TYPE_STRING, 0, 0, "Extra", OPEN_FRM_ONLY},
92429242
{"PRIVILEGES", 80, MYSQL_TYPE_STRING, 0, 0, "Privileges", OPEN_FRM_ONLY},
92439243
{"COLUMN_COMMENT", COLUMN_COMMENT_MAXLEN, MYSQL_TYPE_STRING, 0, 0,
92449244
"Comment", OPEN_FRM_ONLY},

‎tests/mysql_client_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7557,7 +7557,7 @@ static void test_explain_bug()
75577557
verify_prepare_field(result, 5, "Extra", "EXTRA",
75587558
mysql_get_server_version(mysql) <= 50000 ?
75597559
MYSQL_TYPE_STRING : MYSQL_TYPE_VAR_STRING,
7560-
0, 0, "information_schema", 30, 0);
7560+
0, 0, "information_schema", 80, 0);
75617561

75627562
mysql_free_result(result);
75637563
mysql_stmt_close(stmt);

0 commit comments

Comments
 (0)