diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:59:57 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-30 12:59:57 +0200 |
| commit | b81b1943932a383a92bcd22d053e112198507ae2 (patch) | |
| tree | b02d52c43aed34e9320994555ca42fb952fdf10f /mysql-test/suite/innodb/r | |
| parent | b18241e059c17d4ad533dac3729302aa0ef60345 (diff) | |
| parent | a27bfb2a872ea48a5083c2558bca58dc4358316f (diff) | |
| download | mariadb-git-b81b1943932a383a92bcd22d053e112198507ae2.tar.gz | |
Merge 10.10 into 10.11
Diffstat (limited to 'mysql-test/suite/innodb/r')
| -rw-r--r-- | mysql-test/suite/innodb/r/log_corruption.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/r/log_upgrade.result | 16 |
2 files changed, 16 insertions, 8 deletions
diff --git a/mysql-test/suite/innodb/r/log_corruption.result b/mysql-test/suite/innodb/r/log_corruption.result index 58a0e39e781..df58a90dcec 100644 --- a/mysql-test/suite/innodb/r/log_corruption.result +++ b/mysql-test/suite/innodb/r/log_corruption.result @@ -190,14 +190,6 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED'); COUNT(*) 1 FOUND 4 /InnoDB: Upgrading redo log:/ in mysqld.1.err -# Empty large multi-file redo log from after MariaDB 10.2.2 -# restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-force-recovery=5 --innodb-log-file-size=4m -SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES -WHERE engine = 'innodb' -AND support IN ('YES', 'DEFAULT', 'ENABLED'); -COUNT(*) -1 -FOUND 5 /InnoDB: Upgrading redo log:/ in mysqld.1.err # Minimal MariaDB 10.1.21 encrypted redo log # restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-force-recovery=5 SELECT * FROM INFORMATION_SCHEMA.ENGINES diff --git a/mysql-test/suite/innodb/r/log_upgrade.result b/mysql-test/suite/innodb/r/log_upgrade.result new file mode 100644 index 00000000000..4da83460f93 --- /dev/null +++ b/mysql-test/suite/innodb/r/log_upgrade.result @@ -0,0 +1,16 @@ +call mtr.add_suppression("InnoDB: The change buffer is corrupted"); +# +# MDEV-24412 InnoDB: Upgrade after a crash is not supported +# +# restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_upgrade --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_upgrade --innodb-force-recovery=5 --innodb-log-file-size=4m +SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES +WHERE engine = 'innodb' +AND support IN ('YES', 'DEFAULT', 'ENABLED'); +COUNT(*) +1 +FOUND 1 /InnoDB: Upgrading redo log:/ in mysqld.1.err +ib_buffer_pool +ib_logfile0 +ibdata1 +# restart +# End of 10.5 tests |