A cleanup for MDEV-29446 Change SHOW CREATE TABLE to display default collation

Recording test results according to MDEV-29446 changes:

  mysql-test/suite/galera/r/galera_rsu_wsrep_desync.result
  mysql-test/suite/galera/r/galera_sync_wait_show.result
  mysql-test/suite/galera/r/lp1376747-4.result
  mysql-test/suite/s3/replication_partition.result
  mysql-test/suite/s3/replication_stmt.result

mysql-test/suite/galera/r/galera_rsu_wsrep_desync.result

@@ -17,7 +17,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` int(11) DEFAULT NULL,
   `f2` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SHOW VARIABLES LIKE 'wsrep_desync';
 Variable_name	Value
 wsrep_desync	OFF
@@ -44,7 +44,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` int(11) DEFAULT NULL,
   `f2` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SET wsrep_OSU_method=TOI;
 DROP TABLE t1;
 SET DEBUG_SYNC= 'RESET';

mysql-test/suite/galera/r/galera_sync_wait_show.result

@@ -7,7 +7,7 @@ CREATE DATABASE db1;
 connection node_2;
 SHOW CREATE DATABASE db1;
 Database	Create Database
-db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET latin1 */
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */
 DROP DATABASE db1;
 connection node_1;
 CREATE PROCEDURE p1 () SELECT 1 FROM DUAL;

mysql-test/suite/galera/r/lp1376747-4.result

@@ -16,7 +16,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` int(11) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SET debug_sync='flush_tables_with_read_lock_after_acquire_locks SIGNAL parked2 WAIT_FOR go2';
 FLUSH TABLES t1 WITH READ LOCK;;
 connection node_2;
@@ -28,7 +28,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `id` int(11) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 connection node_2a;
 set debug_sync= 'RESET';
 UNLOCK TABLES;
@@ -39,7 +39,7 @@ t1	CREATE TABLE `t1` (
   `id` int(11) NOT NULL,
   `f2` int(11) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SELECT * from t1;
 id	f2
 1	NULL

mysql-test/suite/s3/replication_partition.result

@@ -31,7 +31,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY HASH (`c1`)
 PARTITIONS 9
 select sum(c1) from t1;
@@ -58,7 +58,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` int(11) DEFAULT NULL,
   PRIMARY KEY (`c1`)
-) ENGINE=S3 DEFAULT CHARSET=latin1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY RANGE (`c1`)
 (PARTITION `p1` VALUES LESS THAN (200) ENGINE = S3,
  PARTITION `p2` VALUES LESS THAN (300) ENGINE = S3,
@@ -77,7 +77,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` int(11) DEFAULT NULL,
   PRIMARY KEY (`c1`)
-) ENGINE=S3 DEFAULT CHARSET=latin1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY RANGE (`c1`)
 (PARTITION `p1` VALUES LESS THAN (200) ENGINE = S3,
  PARTITION `p2` VALUES LESS THAN (300) ENGINE = S3,
@@ -99,7 +99,7 @@ t1	CREATE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` int(11) DEFAULT NULL,
   PRIMARY KEY (`c1`)
-) ENGINE=S3 DEFAULT CHARSET=latin1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY RANGE (`c1`)
 (PARTITION `p1` VALUES LESS THAN (200) ENGINE = S3,
  PARTITION `p2` VALUES LESS THAN (300) ENGINE = S3,
@@ -243,7 +243,7 @@ slave-bin.000001	#	Query	#	#	use `database`; CREATE OR REPLACE TABLE `t1` (
   `c1` int(11) NOT NULL,
   `c2` int(11) DEFAULT NULL,
   PRIMARY KEY (`c1`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY RANGE (`c1`)
 (PARTITION `p2` VALUES LESS THAN (300) ENGINE = InnoDB,
  PARTITION `p3` VALUES LESS THAN (400) ENGINE = InnoDB)

mysql-test/suite/s3/replication_stmt.result

@@ -21,7 +21,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection slave;
 use database;
 select * from t1 limit 2;
@@ -84,7 +84,7 @@ t1	CREATE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   `d` int(11) DEFAULT NULL,
   `e` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 # Convert S3 table to Aria with rename. Rows should be binary logged
 connection master;
 alter table t1 engine=s3;
@@ -102,7 +102,7 @@ t2	CREATE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   `d` int(11) DEFAULT NULL,
   `e` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection master;
 drop table t2;
 connection slave;
@@ -154,7 +154,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 select * from t1 limit 2;
 a	b	c
 select * from t2 limit 2;
@@ -217,7 +217,7 @@ slave-bin.000001	#	Query	#	#	use `database`; CREATE OR REPLACE TABLE `t1` (
   `c` int(11) DEFAULT NULL,
   `d` int(11) DEFAULT NULL,
   `e` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 slave-bin.000001	#	Annotate_rows	#	#	alter table t1 engine=aria
 slave-bin.000001	#	Table_map	#	#	table_id: # (database.t1)
 slave-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F
@@ -232,7 +232,7 @@ slave-bin.000001	#	Query	#	#	use `database`; CREATE OR REPLACE TABLE `t2` (
   `c` int(11) DEFAULT NULL,
   `d` int(11) DEFAULT NULL,
   `e` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 slave-bin.000001	#	Annotate_rows	#	#	alter table t1 rename t2, engine=aria
 slave-bin.000001	#	Table_map	#	#	table_id: # (database.t2)
 slave-bin.000001	#	Write_rows_v1	#	#	table_id: # flags: STMT_END_F