diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 22:54:22 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-11 22:54:22 +0200 |
| commit | 21239bb0fd2859968d3c42dcc56712a8978b6207 (patch) | |
| tree | 3b8a776ab601722def8edf3b1ab1090c8051d215 /mysql-test | |
| parent | 6dd302d164d13d6c4793af9f03412ee092652226 (diff) | |
| download | mariadb-git-21239bb0fd2859968d3c42dcc56712a8978b6207.tar.gz | |
After-merge fix to innodb.log_corruption
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/log_corruption.test | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result b/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result index e85ad3c9db7..23e8a1c98c8 100644 --- a/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result +++ b/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result @@ -124,8 +124,8 @@ SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); COUNT(*) -0 -FOUND 1 /InnoDB: Upgrading redo log:/ in mysqld.1.err +1 +FOUND 2 /InnoDB: Upgrading redo log:/ in mysqld.1.err # Minimal MariaDB 10.1.21 encrypted redo log SELECT COUNT(*) `1` FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); diff --git a/mysql-test/suite/innodb/t/log_corruption.test b/mysql-test/suite/innodb/t/log_corruption.test index a1d85b9f698..ca5d945afb7 100644 --- a/mysql-test/suite/innodb/t/log_corruption.test +++ b/mysql-test/suite/innodb/t/log_corruption.test @@ -428,8 +428,15 @@ print OUT pack("Nx[5]nx[5]", 1, 0x1286); print OUT "ibbackup was here!!!1!"; print OUT pack("x[470]N", 0x52b54540); # In encryption.innodb_log_corruption the previous step would -# replace the block with an encrypted one. Rewrite it as it was. -die unless seek(OUT, 0x800, 0); +# replace the block with an encrypted one and update the checkpoint. +# Restore them. +# invalid (all-zero) checkpoint page 1 and an empty log page +print OUT chr(0) x 1024; +# valid checkpoint block 2 +print OUT pack("x[12]NNNx[264]", 0x12860c, 0, 0x80c); +# pointer to the MLOG_CHECKPOINT record, and checkpoint page checksum +print OUT pack("H*x[204]NNN", "590DBAACFE922582", 0x128612, 0, 0x101741b); +# log page print OUT pack("NnnNx[496]N", 0x80000944, 12, 12, 1, 0x46c8a2a2); close OUT or die; EOF |