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-features#117.result
  mysql-test/suite/galera/r/galera_can_run_toi.result
  mysql-test/suite/galera/r/wsrep_strict_ddl.result
  mysql-test/suite/s3/alter.result
  mysql-test/suite/s3/arguments.result
  mysql-test/suite/s3/basic.result
  mysql-test/suite/s3/encryption.result
  mysql-test/suite/s3/innodb.result
  mysql-test/suite/s3/mysqldump.result
  mysql-test/suite/s3/partition.result
  mysql-test/suite/s3/partition_move.result
  mysql-test/suite/s3/replication_delayed.result
  mysql-test/suite/s3/replication_mixed.result

mysql-test/suite/galera/r/galera-features#117.result

@@ -13,7 +13,7 @@ SHOW CREATE TABLE test.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
 SHOW STATUS LIKE 'wsrep_cluster_status';
 Variable_name	Value
 wsrep_cluster_status	Primary
@@ -24,7 +24,7 @@ SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `f2` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SHOW STATUS LIKE 'wsrep_cluster_status';
 Variable_name	Value
 wsrep_cluster_status	Disconnected

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

@@ -9,7 +9,7 @@ SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
   `c1` varchar(10) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t3 values (1);
 SET sql_mode=default;
 ALTER TABLE t3 engine=innodbCLUSTER;
@@ -18,7 +18,7 @@ SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
   `c1` varchar(10) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t3;
 SET sql_mode='';
 SET SESSION default_storage_engine=MyISAM;
@@ -34,5 +34,5 @@ SHOW CREATE TABLE t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
   `c1` varchar(10) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t3;

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

@@ -37,14 +37,14 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` int(11) NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 connection node_2;
 SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` int(11) NOT NULL,
   PRIMARY KEY (`a`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 connection node_1;
 TRUNCATE TABLE before_t1;
 ERROR HY000: DDL-statement is forbidden as table storage engine does not support Galera replication
@@ -86,7 +86,7 @@ before_t1	CREATE TABLE `before_t1` (
   `count` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection node_2;
 SHOW CREATE TABLE before_t1;
 Table	Create Table
@@ -95,7 +95,7 @@ before_t1	CREATE TABLE `before_t1` (
   `count` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection node_1;
 DROP INDEX b ON before_t1;
 ERROR HY000: DDL-statement is forbidden as table storage engine does not support Galera replication
@@ -106,7 +106,7 @@ before_t1	CREATE TABLE `before_t1` (
   `count` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection node_2;
 SHOW CREATE TABLE before_t1;
 Table	Create Table
@@ -115,7 +115,7 @@ before_t1	CREATE TABLE `before_t1` (
   `count` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection node_1;
 ALTER TABLE before_t1 ADD COLUMN f int;
 ERROR HY000: DDL-statement is forbidden as table storage engine does not support Galera replication
@@ -126,7 +126,7 @@ before_t1	CREATE TABLE `before_t1` (
   `count` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection node_2;
 SHOW CREATE TABLE before_t1;
 Table	Create Table
@@ -135,7 +135,7 @@ before_t1	CREATE TABLE `before_t1` (
   `count` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection node_1;
 RENAME TABLE before_t1 to after_t1;
 ERROR HY000: DDL-statement is forbidden as table storage engine does not support Galera replication
@@ -146,7 +146,7 @@ before_t1	CREATE TABLE `before_t1` (
   `count` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 SHOW CREATE TABLE after_t1;
 ERROR 42S02: Table 'test.after_t1' doesn't exist
 connection node_2;
@@ -157,7 +157,7 @@ before_t1	CREATE TABLE `before_t1` (
   `count` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 SHOW CREATE TABLE after_t1;
 ERROR 42S02: Table 'test.after_t1' doesn't exist
 connection node_1;
@@ -170,7 +170,7 @@ before_t1	CREATE TABLE `before_t1` (
   `count` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection node_2;
 SHOW CREATE TABLE before_t1;
 Table	Create Table
@@ -179,7 +179,7 @@ before_t1	CREATE TABLE `before_t1` (
   `count` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `b` (`b`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection node_1;
 set @@global.wsrep_strict_ddl=OFF;
 select @@global.wsrep_strict_ddl;

mysql-test/suite/s3/alter.result

@@ -10,29 +10,29 @@ 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
 alter table t1 comment="hello";
 show create table t1;
 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 COMMENT='hello'
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='hello'
 alter table t1 engine=aria;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 COMMENT='hello'
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='hello'
 alter table t1 engine=s3;
 alter table t1 engine=innodb;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 COMMENT='hello'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='hello'
 select count(*), sum(a), sum(b) from t1;
 count(*)	sum(a)	sum(b)
 1000	500500	510500
@@ -50,14 +50,14 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `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
 alter table t2 rename to t3, engine=aria;
 show create table t3;
 Table	Create Table
 t3	CREATE TABLE `t3` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 select count(*), sum(a), sum(b) from t3;
 count(*)	sum(a)	sum(b)
 10	55	155
@@ -73,7 +73,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 `compression_algorithm`='zlib'
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 `compression_algorithm`='zlib'
 select count(*), sum(a), sum(b) from t1;
 count(*)	sum(a)	sum(b)
 1000	500500	510500
@@ -91,7 +91,7 @@ t1	CREATE TABLE `t1` (
   `b` int(11) DEFAULT NULL,
   `c` int(11) DEFAULT NULL,
   `d` 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 count(*), sum(a), sum(b), sum(c), sum(d) from t1;
 count(*)	sum(a)	sum(b)	sum(c)	sum(d)
 10	55	155	NULL	NULL

mysql-test/suite/s3/arguments.result

@@ -11,7 +11,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `s3_block_size`=819200 `compression_algorithm`='zlib'
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 `s3_block_size`=819200 `compression_algorithm`='zlib'
 alter table t1 engine=s3, s3_block_size=8192;
 ERROR HY000: Incorrect value '8192' for option 's3_block_size'
 alter table t1 engine=s3, s3_block_size=65536;
@@ -21,7 +21,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `compression_algorithm`='zlib' `s3_block_size`=65536
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 `compression_algorithm`='zlib' `s3_block_size`=65536
 alter table t1 engine=s3, s3_block_size=100000;
 ERROR HY000: Incorrect value '100000' for option 's3_block_size'
 show create table t1;
@@ -30,7 +30,7 @@ t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL,
   KEY `a` (`a`)
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 `compression_algorithm`='zlib' `s3_block_size`=65536
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 `compression_algorithm`='zlib' `s3_block_size`=65536
 alter table t1 engine=s3, compression_algorithm="wss";
 ERROR HY000: Incorrect value 'wss' for option 'compression_algorithm'
 drop table t1;

mysql-test/suite/s3/basic.result

@@ -13,7 +13,7 @@ t1	CREATE TABLE `t1` (
   `c` varchar(1000) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `c` (`c`)
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 select * from information_schema.tables where table_schema="database" and table_name="t1";;
 TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	VERSION	ROW_FORMAT	TABLE_ROWS	AVG_ROW_LENGTH	DATA_LENGTH	MAX_DATA_LENGTH	INDEX_LENGTH	DATA_FREE	AUTO_INCREMENT	CREATE_TIME	UPDATE_TIME	CHECK_TIME	TABLE_COLLATION	CHECKSUM	CREATE_OPTIONS	TABLE_COMMENT	MAX_INDEX_LENGTH	TEMPORARY
 def	#	t1	BASE TABLE	S3	10	Page	10000	567	5677056	#	761856	0	NULL	#	#	#	latin1_swedish_ci	NULL	page_checksum=1		2305843009213685760	#
@@ -102,7 +102,7 @@ t1	CREATE TABLE `t1` (
   `c` varchar(1000) DEFAULT NULL,
   KEY `a` (`a`),
   KEY `c` (`c`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 select a,b from t1 limit 10;
 a	b
 1	11

mysql-test/suite/s3/encryption.result

@@ -15,7 +15,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 ALTER TABLE t1 ENGINE=Aria;
 select * from t1;
 a

mysql-test/suite/s3/innodb.result

@@ -10,21 +10,21 @@ 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
 alter table t1 comment="hello";
 show create table t1;
 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 COMMENT='hello'
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='hello'
 alter table t1 engine=innodb;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 COMMENT='hello'
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 COMMENT='hello'
 select count(*), sum(a), sum(b) from t1;
 count(*)	sum(a)	sum(b)
 1000	500500	510500

mysql-test/suite/s3/mysqldump.result

@@ -21,7 +21,7 @@ CREATE TABLE `t1` (
   `pk` int(11) NOT NULL,
   `a` int(11) DEFAULT NULL,
   PRIMARY KEY (`pk`)
-) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1;
+) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 INSERT INTO `t1` VALUES (1,1),(2,2),(3,3),(4,4);
 ALTER TABLE `t1` ENGINE=S3;

mysql-test/suite/s3/partition.result

@@ -90,7 +90,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY RANGE (`c1`)
 SUBPARTITION BY HASH (`c2`)
 SUBPARTITIONS 2
@@ -110,7 +110,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `c1` int(11) DEFAULT NULL,
   `c2` int(11) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
  PARTITION BY RANGE (`c1`)
 SUBPARTITION BY HASH (`c2`)
 SUBPARTITIONS 2
@@ -136,7 +136,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `c1` int(11) DEFAULT NULL,
   `c2` 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 count(*) FROM t2;
 count(*)
 4

mysql-test/suite/s3/partition_move.result

@@ -12,7 +12,7 @@ archive	CREATE TABLE `archive` (
   `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 `p0` VALUES LESS THAN (100) ENGINE = S3)
 CREATE TABLE t1 (
@@ -34,7 +34,7 @@ p1	CREATE TABLE `p1` (
   `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
 select count(*) from p1;
 count(*)
 100
@@ -51,7 +51,7 @@ t1	CREATE 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)
@@ -61,7 +61,7 @@ archive	CREATE TABLE `archive` (
   `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 `p0` VALUES LESS THAN (100) ENGINE = S3,
  PARTITION `p1` VALUES LESS THAN (200) ENGINE = S3)

mysql-test/suite/s3/replication_delayed.result

@@ -42,7 +42,7 @@ show create table t100;
 Table	Create Table
 t100	CREATE TABLE `t100` (
   `pk` varchar(100) DEFAULT NULL
-) ENGINE=S3 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
+) ENGINE=S3 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1
 connection slave;
 select count(*) from t100;
 count(*)