Skip to content

Commit 36393de

Browse files
roylysengroylyseng
committed
Bug#36112585: Data type is changed from VAR_STRING to STRING by UNION if
 all values are empty string Followup to original bugfix. Rerecord a few test file results. Change-Id: I96b89482d1ccee304e27b621ccc2e4eabae8a066
1 parent 65b0914 commit 36393de

10 files changed

+140
-140
lines changed

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

Lines changed: 56 additions & 56 deletions
Large diffs are not rendered by default.

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

Lines changed: 56 additions & 56 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ COLLATION_NAME varchar(64) YES NULL
4444
DTD_IDENTIFIER longtext YES NULL
4545
ROUTINE_BODY varchar(8) NO
4646
ROUTINE_DEFINITION longtext YES NULL
47-
EXTERNAL_NAME binary(0) YES NULL
47+
EXTERNAL_NAME varbinary(0) YES NULL
4848
EXTERNAL_LANGUAGE varchar(64) NO SQL
4949
PARAMETER_STYLE varchar(3) NO
5050
IS_DETERMINISTIC varchar(3) NO
5151
SQL_DATA_ACCESS enum('CONTAINS SQL','NO SQL','READS SQL DATA','MODIFIES SQL DATA') NO NULL
52-
SQL_PATH binary(0) YES NULL
52+
SQL_PATH varbinary(0) YES NULL
5353
SECURITY_TYPE enum('DEFAULT','INVOKER','DEFINER') NO NULL
5454
CREATED timestamp NO NULL
5555
LAST_ALTERED timestamp NO NULL
@@ -80,12 +80,12 @@ COLLATION_NAME varchar(64) YES NULL
8080
DTD_IDENTIFIER longtext YES NULL
8181
ROUTINE_BODY varchar(8) NO
8282
ROUTINE_DEFINITION longtext YES NULL
83-
EXTERNAL_NAME binary(0) YES NULL
83+
EXTERNAL_NAME varbinary(0) YES NULL
8484
EXTERNAL_LANGUAGE varchar(64) NO SQL
8585
PARAMETER_STYLE varchar(3) NO
8686
IS_DETERMINISTIC varchar(3) NO
8787
SQL_DATA_ACCESS enum('CONTAINS SQL','NO SQL','READS SQL DATA','MODIFIES SQL DATA') NO NULL
88-
SQL_PATH binary(0) YES NULL
88+
SQL_PATH varbinary(0) YES NULL
8989
SECURITY_TYPE enum('DEFAULT','INVOKER','DEFINER') NO NULL
9090
CREATED timestamp NO NULL
9191
LAST_ALTERED timestamp NO NULL

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ COLLATION_NAME varchar(64) YES NULL
4444
DTD_IDENTIFIER longtext YES NULL
4545
ROUTINE_BODY varchar(8) NO
4646
ROUTINE_DEFINITION longtext YES NULL
47-
EXTERNAL_NAME binary(0) YES NULL
47+
EXTERNAL_NAME varbinary(0) YES NULL
4848
EXTERNAL_LANGUAGE varchar(64) NO SQL
4949
PARAMETER_STYLE varchar(3) NO
5050
IS_DETERMINISTIC varchar(3) NO
5151
SQL_DATA_ACCESS enum('CONTAINS SQL','NO SQL','READS SQL DATA','MODIFIES SQL DATA') NO NULL
52-
SQL_PATH binary(0) YES NULL
52+
SQL_PATH varbinary(0) YES NULL
5353
SECURITY_TYPE enum('DEFAULT','INVOKER','DEFINER') NO NULL
5454
CREATED timestamp NO NULL
5555
LAST_ALTERED timestamp NO NULL
@@ -80,12 +80,12 @@ COLLATION_NAME varchar(64) YES NULL
8080
DTD_IDENTIFIER longtext YES NULL
8181
ROUTINE_BODY varchar(8) NO
8282
ROUTINE_DEFINITION longtext YES NULL
83-
EXTERNAL_NAME binary(0) YES NULL
83+
EXTERNAL_NAME varbinary(0) YES NULL
8484
EXTERNAL_LANGUAGE varchar(64) NO SQL
8585
PARAMETER_STYLE varchar(3) NO
8686
IS_DETERMINISTIC varchar(3) NO
8787
SQL_DATA_ACCESS enum('CONTAINS SQL','NO SQL','READS SQL DATA','MODIFIES SQL DATA') NO NULL
88-
SQL_PATH binary(0) YES NULL
88+
SQL_PATH varbinary(0) YES NULL
8989
SECURITY_TYPE enum('DEFAULT','INVOKER','DEFINER') NO NULL
9090
CREATED timestamp NO NULL
9191
LAST_ALTERED timestamp NO NULL

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ CATALOG_NAME varchar(64) NO NULL
3232
SCHEMA_NAME varchar(64) NO NULL
3333
DEFAULT_CHARACTER_SET_NAME varchar(64) NO NULL
3434
DEFAULT_COLLATION_NAME varchar(64) NO NULL
35-
SQL_PATH binary(0) YES NULL
35+
SQL_PATH varbinary(0) YES NULL
3636
DEFAULT_ENCRYPTION enum('NO','YES') NO NULL
3737
SHOW CREATE TABLE information_schema.SCHEMATA;
3838
View Create View character_set_client collation_connection
@@ -43,7 +43,7 @@ CATALOG_NAME varchar(64) NO NULL
4343
SCHEMA_NAME varchar(64) NO NULL
4444
DEFAULT_CHARACTER_SET_NAME varchar(64) NO NULL
4545
DEFAULT_COLLATION_NAME varchar(64) NO NULL
46-
SQL_PATH binary(0) YES NULL
46+
SQL_PATH varbinary(0) YES NULL
4747
DEFAULT_ENCRYPTION enum('NO','YES') NO NULL
4848
SELECT catalog_name, schema_name, sql_path
4949
FROM information_schema.schemata

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ CATALOG_NAME varchar(64) YES NULL
3232
SCHEMA_NAME varchar(64) YES NULL
3333
DEFAULT_CHARACTER_SET_NAME varchar(64) NO NULL
3434
DEFAULT_COLLATION_NAME varchar(64) NO NULL
35-
SQL_PATH binary(0) YES NULL
35+
SQL_PATH varbinary(0) YES NULL
3636
DEFAULT_ENCRYPTION enum('NO','YES') NO NULL
3737
SHOW CREATE TABLE information_schema.SCHEMATA;
3838
View Create View character_set_client collation_connection
@@ -43,7 +43,7 @@ CATALOG_NAME varchar(64) YES NULL
4343
SCHEMA_NAME varchar(64) YES NULL
4444
DEFAULT_CHARACTER_SET_NAME varchar(64) NO NULL
4545
DEFAULT_COLLATION_NAME varchar(64) NO NULL
46-
SQL_PATH binary(0) YES NULL
46+
SQL_PATH varbinary(0) YES NULL
4747
DEFAULT_ENCRYPTION enum('NO','YES') NO NULL
4848
SELECT catalog_name, schema_name, sql_path
4949
FROM information_schema.schemata

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ COLUMN_NAME varchar(64) YES NULL
3939
COLLATION varchar(1) YES NULL
4040
CARDINALITY bigint YES NULL
4141
SUB_PART bigint YES NULL
42-
PACKED binary(0) YES NULL
42+
PACKED varbinary(0) YES NULL
4343
NULLABLE varchar(3) NO
4444
INDEX_TYPE varchar(11) NO
4545
COMMENT varchar(8) NO
@@ -62,7 +62,7 @@ COLUMN_NAME varchar(64) YES NULL
6262
COLLATION varchar(1) YES NULL
6363
CARDINALITY bigint YES NULL
6464
SUB_PART bigint YES NULL
65-
PACKED binary(0) YES NULL
65+
PACKED varbinary(0) YES NULL
6666
NULLABLE varchar(3) NO
6767
INDEX_TYPE varchar(11) NO
6868
COMMENT varchar(8) NO

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ COLUMN_NAME varchar(64) YES NULL
3939
COLLATION varchar(1) YES NULL
4040
CARDINALITY bigint YES NULL
4141
SUB_PART bigint YES NULL
42-
PACKED binary(0) YES NULL
42+
PACKED varbinary(0) YES NULL
4343
NULLABLE varchar(3) NO
4444
INDEX_TYPE varchar(11) NO
4545
COMMENT varchar(8) NO
@@ -62,7 +62,7 @@ COLUMN_NAME varchar(64) YES NULL
6262
COLLATION varchar(1) YES NULL
6363
CARDINALITY bigint YES NULL
6464
SUB_PART bigint YES NULL
65-
PACKED binary(0) YES NULL
65+
PACKED varbinary(0) YES NULL
6666
NULLABLE varchar(3) NO
6767
INDEX_TYPE varchar(11) NO
6868
COMMENT varchar(8) NO

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ EVENT_OBJECT_CATALOG varchar(64) NO NULL
3636
EVENT_OBJECT_SCHEMA varchar(64) NO NULL
3737
EVENT_OBJECT_TABLE varchar(64) NO NULL
3838
ACTION_ORDER int unsigned NO NULL
39-
ACTION_CONDITION binary(0) YES NULL
39+
ACTION_CONDITION varbinary(0) YES NULL
4040
ACTION_STATEMENT longtext NO NULL
4141
ACTION_ORIENTATION varchar(3) NO
4242
ACTION_TIMING enum('BEFORE','AFTER') NO NULL
43-
ACTION_REFERENCE_OLD_TABLE binary(0) YES NULL
44-
ACTION_REFERENCE_NEW_TABLE binary(0) YES NULL
43+
ACTION_REFERENCE_OLD_TABLE varbinary(0) YES NULL
44+
ACTION_REFERENCE_NEW_TABLE varbinary(0) YES NULL
4545
ACTION_REFERENCE_OLD_ROW varchar(3) NO
4646
ACTION_REFERENCE_NEW_ROW varchar(3) NO
4747
CREATED timestamp(2) NO NULL
@@ -63,12 +63,12 @@ EVENT_OBJECT_CATALOG varchar(64) NO NULL
6363
EVENT_OBJECT_SCHEMA varchar(64) NO NULL
6464
EVENT_OBJECT_TABLE varchar(64) NO NULL
6565
ACTION_ORDER int unsigned NO NULL
66-
ACTION_CONDITION binary(0) YES NULL
66+
ACTION_CONDITION varbinary(0) YES NULL
6767
ACTION_STATEMENT longtext NO NULL
6868
ACTION_ORIENTATION varchar(3) NO
6969
ACTION_TIMING enum('BEFORE','AFTER') NO NULL
70-
ACTION_REFERENCE_OLD_TABLE binary(0) YES NULL
71-
ACTION_REFERENCE_NEW_TABLE binary(0) YES NULL
70+
ACTION_REFERENCE_OLD_TABLE varbinary(0) YES NULL
71+
ACTION_REFERENCE_NEW_TABLE varbinary(0) YES NULL
7272
ACTION_REFERENCE_OLD_ROW varchar(3) NO
7373
ACTION_REFERENCE_NEW_ROW varchar(3) NO
7474
CREATED timestamp(2) NO NULL

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ EVENT_OBJECT_CATALOG varchar(64) YES NULL
3636
EVENT_OBJECT_SCHEMA varchar(64) YES NULL
3737
EVENT_OBJECT_TABLE varchar(64) YES NULL
3838
ACTION_ORDER int unsigned NO NULL
39-
ACTION_CONDITION binary(0) YES NULL
39+
ACTION_CONDITION varbinary(0) YES NULL
4040
ACTION_STATEMENT longtext NO NULL
4141
ACTION_ORIENTATION varchar(3) NO
4242
ACTION_TIMING enum('BEFORE','AFTER') NO NULL
43-
ACTION_REFERENCE_OLD_TABLE binary(0) YES NULL
44-
ACTION_REFERENCE_NEW_TABLE binary(0) YES NULL
43+
ACTION_REFERENCE_OLD_TABLE varbinary(0) YES NULL
44+
ACTION_REFERENCE_NEW_TABLE varbinary(0) YES NULL
4545
ACTION_REFERENCE_OLD_ROW varchar(3) NO
4646
ACTION_REFERENCE_NEW_ROW varchar(3) NO
4747
CREATED timestamp(2) NO NULL
@@ -63,12 +63,12 @@ EVENT_OBJECT_CATALOG varchar(64) YES NULL
6363
EVENT_OBJECT_SCHEMA varchar(64) YES NULL
6464
EVENT_OBJECT_TABLE varchar(64) YES NULL
6565
ACTION_ORDER int unsigned NO NULL
66-
ACTION_CONDITION binary(0) YES NULL
66+
ACTION_CONDITION varbinary(0) YES NULL
6767
ACTION_STATEMENT longtext NO NULL
6868
ACTION_ORIENTATION varchar(3) NO
6969
ACTION_TIMING enum('BEFORE','AFTER') NO NULL
70-
ACTION_REFERENCE_OLD_TABLE binary(0) YES NULL
71-
ACTION_REFERENCE_NEW_TABLE binary(0) YES NULL
70+
ACTION_REFERENCE_OLD_TABLE varbinary(0) YES NULL
71+
ACTION_REFERENCE_NEW_TABLE varbinary(0) YES NULL
7272
ACTION_REFERENCE_OLD_ROW varchar(3) NO
7373
ACTION_REFERENCE_NEW_ROW varchar(3) NO
7474
CREATED timestamp(2) NO NULL

0 commit comments

Comments
 (0)