diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-09-02 17:32:14 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2022-09-12 22:10:39 +0400 |
| commit | f1544424de2b8c9d1c3faefbbdd15543db7dfd12 (patch) | |
| tree | ebac7186e67915f333a5e9fec2e801ae45c8eccc /mysql-test/suite/funcs_1 | |
| parent | 667df98c3e0f32d391af4eb65c618043720b6a2f (diff) | |
| download | mariadb-git-f1544424de2b8c9d1c3faefbbdd15543db7dfd12.tar.gz | |
MDEV-29446 Change SHOW CREATE TABLE to display default collation
Diffstat (limited to 'mysql-test/suite/funcs_1')
32 files changed, 34 insertions, 34 deletions
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result index f4a6d75fbc0..de9b73c2bf5 100644 --- a/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result +++ b/mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result @@ -367,7 +367,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `f1` int(11) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=latin1 +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (1); create trigger tr1 after insert on t1 for each row insert into t2 (f2) values (new.f1+1); diff --git a/mysql-test/suite/funcs_1/r/is_character_sets.result b/mysql-test/suite/funcs_1/r/is_character_sets.result index 4f2015348b5..bdf1fbb7a06 100644 --- a/mysql-test/suite/funcs_1/r/is_character_sets.result +++ b/mysql-test/suite/funcs_1/r/is_character_sets.result @@ -39,7 +39,7 @@ CHARACTER_SETS CREATE TEMPORARY TABLE `CHARACTER_SETS` ( `DEFAULT_COLLATE_NAME` varchar(32) NOT NULL, `DESCRIPTION` varchar(60) NOT NULL, `MAXLEN` bigint(3) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.CHARACTER_SETS; Field Type Null Key Default Extra CHARACTER_SET_NAME varchar(32) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result b/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result index 354d032d168..78b6891e92e 100644 --- a/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result +++ b/mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result @@ -35,7 +35,7 @@ Table Create Table COLLATION_CHARACTER_SET_APPLICABILITY CREATE TEMPORARY TABLE `COLLATION_CHARACTER_SET_APPLICABILITY` ( `COLLATION_NAME` varchar(32) NOT NULL, `CHARACTER_SET_NAME` varchar(32) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.COLLATION_CHARACTER_SET_APPLICABILITY; Field Type Null Key Default Extra COLLATION_NAME varchar(32) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_collations.result b/mysql-test/suite/funcs_1/r/is_collations.result index 80bde843c68..aac559ff424 100644 --- a/mysql-test/suite/funcs_1/r/is_collations.result +++ b/mysql-test/suite/funcs_1/r/is_collations.result @@ -43,7 +43,7 @@ COLLATIONS CREATE TEMPORARY TABLE `COLLATIONS` ( `IS_DEFAULT` varchar(3) NOT NULL, `IS_COMPILED` varchar(3) NOT NULL, `SORTLEN` bigint(3) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.COLLATIONS; Field Type Null Key Default Extra COLLATION_NAME varchar(32) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_column_privileges.result b/mysql-test/suite/funcs_1/r/is_column_privileges.result index 30c16317e56..d5d42a84f30 100644 --- a/mysql-test/suite/funcs_1/r/is_column_privileges.result +++ b/mysql-test/suite/funcs_1/r/is_column_privileges.result @@ -45,7 +45,7 @@ COLUMN_PRIVILEGES CREATE TEMPORARY TABLE `COLUMN_PRIVILEGES` ( `COLUMN_NAME` varchar(64) NOT NULL, `PRIVILEGE_TYPE` varchar(64) NOT NULL, `IS_GRANTABLE` varchar(3) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.COLUMN_PRIVILEGES; Field Type Null Key Default Extra GRANTEE varchar(190) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_columns.result b/mysql-test/suite/funcs_1/r/is_columns.result index 35106e7ded5..52afcb3cf28 100644 --- a/mysql-test/suite/funcs_1/r/is_columns.result +++ b/mysql-test/suite/funcs_1/r/is_columns.result @@ -75,7 +75,7 @@ COLUMNS CREATE TEMPORARY TABLE `COLUMNS` ( `COLUMN_COMMENT` varchar(1024) NOT NULL, `IS_GENERATED` varchar(6) NOT NULL, `GENERATION_EXPRESSION` longtext -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.COLUMNS; Field Type Null Key Default Extra TABLE_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_engines.result b/mysql-test/suite/funcs_1/r/is_engines.result index 949fa93f83d..2b3cb4eec22 100644 --- a/mysql-test/suite/funcs_1/r/is_engines.result +++ b/mysql-test/suite/funcs_1/r/is_engines.result @@ -43,7 +43,7 @@ ENGINES CREATE TEMPORARY TABLE `ENGINES` ( `TRANSACTIONS` varchar(3), `XA` varchar(3), `SAVEPOINTS` varchar(3) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.ENGINES; Field Type Null Key Default Extra ENGINE varchar(64) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_events.result b/mysql-test/suite/funcs_1/r/is_events.result index 09bd4e804a1..b4ee94d01bb 100644 --- a/mysql-test/suite/funcs_1/r/is_events.result +++ b/mysql-test/suite/funcs_1/r/is_events.result @@ -79,7 +79,7 @@ EVENTS CREATE TEMPORARY TABLE `EVENTS` ( `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, `COLLATION_CONNECTION` varchar(32) NOT NULL, `DATABASE_COLLATION` varchar(32) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.EVENTS; Field Type Null Key Default Extra EVENT_CATALOG varchar(64) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage.result b/mysql-test/suite/funcs_1/r/is_key_column_usage.result index 2e85a385d47..a3ddcedb534 100644 --- a/mysql-test/suite/funcs_1/r/is_key_column_usage.result +++ b/mysql-test/suite/funcs_1/r/is_key_column_usage.result @@ -55,7 +55,7 @@ KEY_COLUMN_USAGE CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` ( `REFERENCED_TABLE_SCHEMA` varchar(64), `REFERENCED_TABLE_NAME` varchar(64), `REFERENCED_COLUMN_NAME` varchar(64) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE; Field Type Null Key Default Extra CONSTRAINT_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result b/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result index 42bbc170dbc..7b84796dce7 100644 --- a/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_key_column_usage_embedded.result @@ -55,7 +55,7 @@ KEY_COLUMN_USAGE CREATE TEMPORARY TABLE `KEY_COLUMN_USAGE` ( `REFERENCED_TABLE_SCHEMA` varchar(64), `REFERENCED_TABLE_NAME` varchar(64), `REFERENCED_COLUMN_NAME` varchar(64) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.KEY_COLUMN_USAGE; Field Type Null Key Default Extra CONSTRAINT_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_routines.result b/mysql-test/suite/funcs_1/r/is_routines.result index 2b268d78ee7..86a7e5eb601 100644 --- a/mysql-test/suite/funcs_1/r/is_routines.result +++ b/mysql-test/suite/funcs_1/r/is_routines.result @@ -94,7 +94,7 @@ ROUTINES CREATE TEMPORARY TABLE `ROUTINES` ( `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, `COLLATION_CONNECTION` varchar(32) NOT NULL, `DATABASE_COLLATION` varchar(32) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.ROUTINES; Field Type Null Key Default Extra SPECIFIC_NAME varchar(64) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_routines_embedded.result b/mysql-test/suite/funcs_1/r/is_routines_embedded.result index 44fa1123f57..34fed1b46a9 100644 --- a/mysql-test/suite/funcs_1/r/is_routines_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_routines_embedded.result @@ -94,7 +94,7 @@ ROUTINES CREATE TEMPORARY TABLE `ROUTINES` ( `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, `COLLATION_CONNECTION` varchar(32) NOT NULL, `DATABASE_COLLATION` varchar(32) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.ROUTINES; Field Type Null Key Default Extra SPECIFIC_NAME varchar(64) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_schema_privileges.result b/mysql-test/suite/funcs_1/r/is_schema_privileges.result index 119eda6d7af..a840142d005 100644 --- a/mysql-test/suite/funcs_1/r/is_schema_privileges.result +++ b/mysql-test/suite/funcs_1/r/is_schema_privileges.result @@ -41,7 +41,7 @@ SCHEMA_PRIVILEGES CREATE TEMPORARY TABLE `SCHEMA_PRIVILEGES` ( `TABLE_SCHEMA` varchar(64) NOT NULL, `PRIVILEGE_TYPE` varchar(64) NOT NULL, `IS_GRANTABLE` varchar(3) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.SCHEMA_PRIVILEGES; Field Type Null Key Default Extra GRANTEE varchar(190) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_schemata.result b/mysql-test/suite/funcs_1/r/is_schemata.result index b0339886636..a3403f43ab0 100644 --- a/mysql-test/suite/funcs_1/r/is_schemata.result +++ b/mysql-test/suite/funcs_1/r/is_schemata.result @@ -41,7 +41,7 @@ SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` ( `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL, `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL, `SQL_PATH` varchar(512) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.SCHEMATA; Field Type Null Key Default Extra CATALOG_NAME varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result index 3a97fb5eeef..2e9715aaa16 100644 --- a/mysql-test/suite/funcs_1/r/is_schemata_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_schemata_embedded.result @@ -41,7 +41,7 @@ SCHEMATA CREATE TEMPORARY TABLE `SCHEMATA` ( `DEFAULT_CHARACTER_SET_NAME` varchar(32) NOT NULL, `DEFAULT_COLLATION_NAME` varchar(32) NOT NULL, `SQL_PATH` varchar(512) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.SCHEMATA; Field Type Null Key Default Extra CATALOG_NAME varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_statistics.result b/mysql-test/suite/funcs_1/r/is_statistics.result index 56dfe587378..aff871dc488 100644 --- a/mysql-test/suite/funcs_1/r/is_statistics.result +++ b/mysql-test/suite/funcs_1/r/is_statistics.result @@ -63,7 +63,7 @@ STATISTICS CREATE TEMPORARY TABLE `STATISTICS` ( `INDEX_TYPE` varchar(16) NOT NULL, `COMMENT` varchar(16), `INDEX_COMMENT` varchar(1024) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.STATISTICS; Field Type Null Key Default Extra TABLE_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints.result b/mysql-test/suite/funcs_1/r/is_table_constraints.result index c1655c69534..3c1cd61c1d0 100644 --- a/mysql-test/suite/funcs_1/r/is_table_constraints.result +++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result @@ -43,7 +43,7 @@ TABLE_CONSTRAINTS CREATE TEMPORARY TABLE `TABLE_CONSTRAINTS` ( `TABLE_SCHEMA` varchar(64) NOT NULL, `TABLE_NAME` varchar(64) NOT NULL, `CONSTRAINT_TYPE` varchar(64) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.TABLE_CONSTRAINTS; Field Type Null Key Default Extra CONSTRAINT_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_table_privileges.result b/mysql-test/suite/funcs_1/r/is_table_privileges.result index 9a8764b29d0..7aec4be2bf1 100644 --- a/mysql-test/suite/funcs_1/r/is_table_privileges.result +++ b/mysql-test/suite/funcs_1/r/is_table_privileges.result @@ -43,7 +43,7 @@ TABLE_PRIVILEGES CREATE TEMPORARY TABLE `TABLE_PRIVILEGES` ( `TABLE_NAME` varchar(64) NOT NULL, `PRIVILEGE_TYPE` varchar(64) NOT NULL, `IS_GRANTABLE` varchar(3) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.TABLE_PRIVILEGES; Field Type Null Key Default Extra GRANTEE varchar(190) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_tables.result b/mysql-test/suite/funcs_1/r/is_tables.result index 010818cad3c..63f5c9a42de 100644 --- a/mysql-test/suite/funcs_1/r/is_tables.result +++ b/mysql-test/suite/funcs_1/r/is_tables.result @@ -77,7 +77,7 @@ TABLES CREATE TEMPORARY TABLE `TABLES` ( `TABLE_COMMENT` varchar(2048) NOT NULL, `MAX_INDEX_LENGTH` bigint(21) unsigned, `TEMPORARY` varchar(1) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.TABLES; Field Type Null Key Default Extra TABLE_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_tables_embedded.result b/mysql-test/suite/funcs_1/r/is_tables_embedded.result index c71414d71ff..cef426ee028 100644 --- a/mysql-test/suite/funcs_1/r/is_tables_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_tables_embedded.result @@ -77,7 +77,7 @@ TABLES CREATE TEMPORARY TABLE `TABLES` ( `TABLE_COMMENT` varchar(2048) NOT NULL, `MAX_INDEX_LENGTH` bigint(21) unsigned, `TEMPORARY` varchar(1) -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.TABLES; Field Type Null Key Default Extra TABLE_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_triggers.result b/mysql-test/suite/funcs_1/r/is_triggers.result index 3960588b3c5..98f3810c950 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers.result +++ b/mysql-test/suite/funcs_1/r/is_triggers.result @@ -77,7 +77,7 @@ TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` ( `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, `COLLATION_CONNECTION` varchar(32) NOT NULL, `DATABASE_COLLATION` varchar(32) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.TRIGGERS; Field Type Null Key Default Extra TRIGGER_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result index 6ed646c1a2c..24426438539 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result @@ -77,7 +77,7 @@ TRIGGERS CREATE TEMPORARY TABLE `TRIGGERS` ( `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, `COLLATION_CONNECTION` varchar(32) NOT NULL, `DATABASE_COLLATION` varchar(32) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.TRIGGERS; Field Type Null Key Default Extra TRIGGER_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_user_privileges.result b/mysql-test/suite/funcs_1/r/is_user_privileges.result index 2a7016baa3d..b35d7c0bb2a 100644 --- a/mysql-test/suite/funcs_1/r/is_user_privileges.result +++ b/mysql-test/suite/funcs_1/r/is_user_privileges.result @@ -39,7 +39,7 @@ USER_PRIVILEGES CREATE TEMPORARY TABLE `USER_PRIVILEGES` ( `TABLE_CATALOG` varchar(512) NOT NULL, `PRIVILEGE_TYPE` varchar(64) NOT NULL, `IS_GRANTABLE` varchar(3) NOT NULL -) ENGINE=MEMORY DEFAULT CHARSET=utf8 +) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.USER_PRIVILEGES; Field Type Null Key Default Extra GRANTEE varchar(190) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_views.result b/mysql-test/suite/funcs_1/r/is_views.result index 82c35913844..fdf22bc93a3 100644 --- a/mysql-test/suite/funcs_1/r/is_views.result +++ b/mysql-test/suite/funcs_1/r/is_views.result @@ -53,7 +53,7 @@ VIEWS CREATE TEMPORARY TABLE `VIEWS` ( `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, `COLLATION_CONNECTION` varchar(32) NOT NULL, `ALGORITHM` varchar(10) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.VIEWS; Field Type Null Key Default Extra TABLE_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/is_views_embedded.result b/mysql-test/suite/funcs_1/r/is_views_embedded.result index 06c2dc05c67..59ccbd8a8df 100644 --- a/mysql-test/suite/funcs_1/r/is_views_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_views_embedded.result @@ -53,7 +53,7 @@ VIEWS CREATE TEMPORARY TABLE `VIEWS` ( `CHARACTER_SET_CLIENT` varchar(32) NOT NULL, `COLLATION_CONNECTION` varchar(32) NOT NULL, `ALGORITHM` varchar(10) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW COLUMNS FROM information_schema.VIEWS; Field Type Null Key Default Extra TABLE_CATALOG varchar(512) NO NULL diff --git a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result index 63b8b643820..41904bf0afd 100644 --- a/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result +++ b/mysql-test/suite/funcs_1/r/memory_trig_1011ext.result @@ -372,7 +372,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `f1` int(11) DEFAULT NULL -) ENGINE=MEMORY DEFAULT CHARSET=latin1 +) ENGINE=MEMORY DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (1); create trigger tr1 after insert on t1 for each row insert into t2 (f2) values (new.f1+1); diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result index e73e0413469..8302c2bd0f9 100644 --- a/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result +++ b/mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result @@ -372,7 +372,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `f1` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci insert into t1 values (1); create trigger tr1 after insert on t1 for each row insert into t2 (f2) values (new.f1+1); diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result index cc5c63cadd5..6648045c1dc 100644 --- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result +++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result @@ -42,7 +42,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `QUERY_ID` bigint(4) NOT NULL, `INFO_BINARY` blob, `TID` bigint(4) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW processlist; Id User Host db Command Time State Info Progress ID root HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS @@ -122,7 +122,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `QUERY_ID` bigint(4) NOT NULL, `INFO_BINARY` blob, `TID` bigint(4) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW processlist; Id User Host db Command Time State Info Progress ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result index aedf557fad5..2a67c0df169 100644 --- a/mysql-test/suite/funcs_1/r/processlist_priv_ps.result +++ b/mysql-test/suite/funcs_1/r/processlist_priv_ps.result @@ -42,7 +42,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `QUERY_ID` bigint(4) NOT NULL, `INFO_BINARY` blob, `TID` bigint(4) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW processlist; Id User Host db Command Time State Info Progress ID root HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS @@ -122,7 +122,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `QUERY_ID` bigint(4) NOT NULL, `INFO_BINARY` blob, `TID` bigint(4) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci SHOW processlist; Id User Host db Command Time State Info Progress ID ddicttestuser1 HOST_NAME information_schema Query TIME Init SHOW processlist TIME_MS diff --git a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result index 7853a125645..0ddd1b96964 100644 --- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result +++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result @@ -30,7 +30,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `QUERY_ID` bigint(4) NOT NULL, `INFO_BINARY` blob, `TID` bigint(4) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci # Ensure that the information about the own connection is correct. #-------------------------------------------------------------------------- diff --git a/mysql-test/suite/funcs_1/r/processlist_val_ps.result b/mysql-test/suite/funcs_1/r/processlist_val_ps.result index 1bbf0609cbc..aa00457a802 100644 --- a/mysql-test/suite/funcs_1/r/processlist_val_ps.result +++ b/mysql-test/suite/funcs_1/r/processlist_val_ps.result @@ -30,7 +30,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( `QUERY_ID` bigint(4) NOT NULL, `INFO_BINARY` blob, `TID` bigint(4) NOT NULL -) DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci # Ensure that the information about the own connection is correct. #-------------------------------------------------------------------------- diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result index 61d5eb8c492..37a422f219a 100644 --- a/mysql-test/suite/funcs_1/r/storedproc.result +++ b/mysql-test/suite/funcs_1/r/storedproc.result @@ -1689,7 +1689,7 @@ CREATE FUNCTION fn1 (s char(20)) returns char(50) return concat('hello, ', s, '!'); show CREATE FUNCTION fn1; Function sql_mode Create Function character_set_client collation_connection Database Collation -fn1 CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50) CHARSET latin1 +fn1 CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(s char(20)) RETURNS char(50) CHARSET latin1 COLLATE latin1_swedish_ci return concat('hello, ', s, '!') latin1 <modified> <created> DROP FUNCTION fn1; |