Merge 10.6 into 10.7

1 files changed, 24 insertions, 24 deletions

diff --git a/mysql-test/suite/engines/funcs/r/ta_drop_pk_autoincrement.result b/mysql-test/suite/engines/funcs/r/ta_drop_pk_autoincrement.result
index 8a95c11d47d..d4082de4e19 100644
--- a/mysql-test/suite/engines/funcs/r/ta_drop_pk_autoincrement.result
+++ b/mysql-test/suite/engines/funcs/r/ta_drop_pk_autoincrement.result
@@ -8,7 +8,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` tinyint(4) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 MODIFY c1 TINYINT NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -17,7 +17,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` tinyint(4) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -30,7 +30,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` smallint(6) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 MODIFY c1 SMALLINT NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -39,7 +39,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` smallint(6) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -52,7 +52,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` mediumint(9) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 MODIFY c1 MEDIUMINT NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -61,7 +61,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` mediumint(9) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -74,7 +74,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 MODIFY c1 INT NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -83,7 +83,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` int(11) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -96,7 +96,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 MODIFY c1 INTEGER NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -105,7 +105,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` int(11) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -118,7 +118,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` bigint(20) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 MODIFY c1 BIGINT NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -127,7 +127,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` bigint(20) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -140,7 +140,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` tinyint(4) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 CHANGE c1 c1 TINYINT NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -149,7 +149,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` tinyint(4) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -162,7 +162,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` smallint(6) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 CHANGE c1 c1 SMALLINT NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -171,7 +171,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` smallint(6) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -184,7 +184,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` mediumint(9) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 CHANGE c1 c1 MEDIUMINT NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -193,7 +193,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` mediumint(9) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -206,7 +206,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 CHANGE c1 c1 INT NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -215,7 +215,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` int(11) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -228,7 +228,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` int(11) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 CHANGE c1 c1 INTEGER NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -237,7 +237,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` int(11) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test
@@ -250,7 +250,7 @@ Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` bigint(20) NOT NULL AUTO_INCREMENT,
   PRIMARY KEY (`c1`)
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 ALTER TABLE t8 CHANGE c1 c1 BIGINT NOT NULL, DROP PRIMARY KEY;
 SHOW TABLES;
 Tables_in_test
@@ -259,7 +259,7 @@ SHOW CREATE TABLE t8;
 Table	Create Table
 t8	CREATE TABLE `t8` (
   `c1` bigint(20) NOT NULL
-) ENGINE=ENGINE DEFAULT CHARSET=latin1
+) ENGINE=ENGINE DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t8;
 SHOW TABLES;
 Tables_in_test