Merge branch '10.3' into 10.4

7 files changed, 11 insertions, 1 deletions

diff --git a/mysql-test/suite/encryption/r/innodb-bad-key-change3.result b/mysql-test/suite/encryption/r/innodb-bad-key-change3.result
index 79155bf43b9..2d414d75c21 100644
--- a/mysql-test/suite/encryption/r/innodb-bad-key-change3.result
+++ b/mysql-test/suite/encryption/r/innodb-bad-key-change3.result
@@ -14,6 +14,7 @@ t1	CREATE TABLE `t1` (
 INSERT INTO t1 VALUES (1,'foobar'),(2,'barfoo');
 FLUSH TABLE t1 FOR EXPORT;
 # List before copying files
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
diff --git a/mysql-test/suite/encryption/r/innodb-checksum-algorithm.result b/mysql-test/suite/encryption/r/innodb-checksum-algorithm.result
index a12b47ef31d..cca3b9ad686 100644
--- a/mysql-test/suite/encryption/r/innodb-checksum-algorithm.result
+++ b/mysql-test/suite/encryption/r/innodb-checksum-algorithm.result
@@ -38,6 +38,7 @@ backup: te_crc32
 backup: t_crc32
 backup: tpe_crc32
 backup: tp_crc32
+db.opt
 t_crc32.cfg
 t_crc32.frm
 t_crc32.ibd
@@ -247,6 +248,7 @@ backup: te_innodb
 backup: t_innodb
 backup: tpe_innodb
 backup: tp_innodb
+db.opt
 t_innodb.cfg
 t_innodb.frm
 t_innodb.ibd
@@ -456,6 +458,7 @@ backup: te_none
 backup: t_none
 backup: tpe_none
 backup: tp_none
+db.opt
 t_none.cfg
 t_none.frm
 t_none.ibd
diff --git a/mysql-test/suite/encryption/r/innodb-discard-import-change.result b/mysql-test/suite/encryption/r/innodb-discard-import-change.result
index 51670d89e52..cafdbef4b69 100644
--- a/mysql-test/suite/encryption/r/innodb-discard-import-change.result
+++ b/mysql-test/suite/encryption/r/innodb-discard-import-change.result
@@ -24,6 +24,7 @@ backup: t2
 backup: t3
 backup: t4
 backup: t5
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
diff --git a/mysql-test/suite/encryption/r/innodb-discard-import.result b/mysql-test/suite/encryption/r/innodb-discard-import.result
index 91314a77177..9f8521b3245 100644
--- a/mysql-test/suite/encryption/r/innodb-discard-import.result
+++ b/mysql-test/suite/encryption/r/innodb-discard-import.result
@@ -44,6 +44,7 @@ count(*)
 2000
 FLUSH TABLE t1,t2,t3,t4 FOR EXPORT;
 # List before copying files
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
@@ -60,6 +61,7 @@ backup: t1
 backup: t2
 backup: t3
 backup: t4
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
diff --git a/mysql-test/suite/encryption/r/innodb_encryption_discard_import.result b/mysql-test/suite/encryption/r/innodb_encryption_discard_import.result
index b503d6c9d30..6b38be38b6d 100644
--- a/mysql-test/suite/encryption/r/innodb_encryption_discard_import.result
+++ b/mysql-test/suite/encryption/r/innodb_encryption_discard_import.result
@@ -25,6 +25,7 @@ NOT FOUND /foobar/ in t1.ibd
 NOT FOUND /temp/ in t2.ibd
 # t3 ... on expecting NOT FOUND
 NOT FOUND /barfoo/ in t3.ibd
+db.opt
 t1.frm
 t1.ibd
 t2.frm
@@ -35,6 +36,7 @@ FLUSH TABLES t1, t2, t3 FOR EXPORT;
 backup: t1
 backup: t2
 backup: t3
+db.opt
 t1.cfg
 t1.frm
 t1.ibd
diff --git a/mysql-test/suite/encryption/t/innodb-scrub-log.test b/mysql-test/suite/encryption/t/innodb-scrub-log.test
index 36ecc88b99a..e8149b6b3ff 100644
--- a/mysql-test/suite/encryption/t/innodb-scrub-log.test
+++ b/mysql-test/suite/encryption/t/innodb-scrub-log.test
@@ -1,7 +1,7 @@
 --source include/have_innodb.inc
 
 #
-# MDEV-11705: InnoDB: Failing assertion: (&log_sys->mutex)->is_owned() if server started with innodb-scrub-log
+# MDEV-11705: InnoDB: Failing assertion: (&log_sys.mutex)->is_owned() if server started with innodb-scrub-log
 #
 
 create table t1(a int not null primary key auto_increment,
diff --git a/mysql-test/suite/encryption/t/innodb_encryption_discard_import.test b/mysql-test/suite/encryption/t/innodb_encryption_discard_import.test
index 099d16f6927..22755571618 100644
--- a/mysql-test/suite/encryption/t/innodb_encryption_discard_import.test
+++ b/mysql-test/suite/encryption/t/innodb_encryption_discard_import.test
@@ -58,6 +58,7 @@ set autocommit=1;
 -- source include/search_pattern_in_file.inc
 
 --source include/start_mysqld.inc
+let MYSQLD_DATADIR =`SELECT @@datadir`;
 
 --list_files $MYSQLD_DATADIR/test
 FLUSH TABLES t1, t2, t3 FOR EXPORT;