diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 08:32:57 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 08:32:57 +0200 |
commit | d32b2e7e8e58a2d3cd8248a9b3d956c3ed7c1a58 (patch) | |
tree | 382e0a32074f1c0a9a4aab2cac714791ac567222 | |
parent | c59985fcf566a4bfadfc01323c17f9d3d0b8d4d7 (diff) | |
parent | 11815641312fdbcab26e47e4b6655c155bc39bde (diff) | |
download | mariadb-git-d32b2e7e8e58a2d3cd8248a9b3d956c3ed7c1a58.tar.gz |
Merge 10.5 into 10.6
-rw-r--r-- | mysql-test/suite/innodb/t/log_upgrade.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/t/log_upgrade.test b/mysql-test/suite/innodb/t/log_upgrade.test index 6f548d93b3e..faf88c41bef 100644 --- a/mysql-test/suite/innodb/t/log_upgrade.test +++ b/mysql-test/suite/innodb/t/log_upgrade.test @@ -4,6 +4,8 @@ # For example, tmpfs on FreeBSD does not support them. # On Microsoft Windows, sparse files have to be created in a special way. --source include/big_test.inc +# include/shutdown_mysqld.inc does not work in ./mtr --embedded +--source include/not_embedded.inc call mtr.add_suppression("InnoDB: The change buffer is corrupted"); |