Merge branch '10.10' into 10.11

mysql-test/include/default_client.cnf

@@ -18,6 +18,9 @@ default-character-set=latin1
 [mysql_upgrade]
 default-character-set=latin1
 
+[mysqlslap]
+loose-skip-ssl
+
 [mysqltest]
 loose-ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem
 loose-ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/client-cert.pem

mysql-test/suite/rpl/r/rpl_change_master_demote.result

@@ -193,6 +193,9 @@ INSERT INTO t1 VALUES (3);
 # Update to account for statements to verify replication in include file
 CHANGE MASTER TO master_host='127.0.0.1', master_port=SLAVE_PORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1;
 RESET SLAVE ALL;
+include/save_master_gtid.inc
+connection slave;
+include/sync_with_master_gtid.inc
 include/rpl_change_master_demote.inc
 ##############################################
 # Connection semantics change:

mysql-test/suite/rpl/t/rpl_change_master_demote.test

@@ -143,6 +143,9 @@ INSERT INTO t1 VALUES (3);
 --eval CHANGE MASTER TO master_host='127.0.0.1', master_port=$SLAVE_MYPORT, master_user='root', master_use_gtid=slave_pos, master_demote_to_slave=1
 RESET SLAVE ALL;
 
+--source include/save_master_gtid.inc
+--connection slave
+--source include/sync_with_master_gtid.inc
 --source include/rpl_change_master_demote.inc
 
 

plugin/hashicorp_key_management/mysql-test/vault/r/hashicorp_encode.result

@@ -15,7 +15,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `b` char(200) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=1
 insert t1 values (12345, repeat('1234567890', 20));
 alter table t1 encryption_key_id=2;
 show create table t1;
@@ -23,7 +23,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `b` char(200) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=2
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=2
 alter table t1 encryption_key_id=33;
 ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTION_KEY_ID'
 show create table t1;
@@ -31,19 +31,19 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `b` char(200) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=2
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=2
 alter table t1 encryption_key_id=3;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `b` char(200) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=3
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=3
 alter table t1 encryption_key_id=4;
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` bigint(20) NOT NULL,
   `b` char(200) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes `encryption_key_id`=4
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=4
 drop table t1;