diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-08 09:54:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-08 09:54:40 +0200 |
| commit | 9ede5692601e7f8b96e9300eb764047c0453f2f4 (patch) | |
| tree | 1b0e94d6180e992ca34935668dc4f6fff0ab8aee /mysql-test | |
| parent | 73cf630ffc2e971fac68addc60c6fbf805665127 (diff) | |
| parent | 16d308e21d91b880f1a59ab964a86e39643cdf1e (diff) | |
| download | mariadb-git-9ede5692601e7f8b96e9300eb764047c0453f2f4.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/mariabackup/huge_lsn.opt | 6 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/huge_lsn.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/mariabackup/huge_lsn.test | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/mysql-test/suite/mariabackup/huge_lsn.opt b/mysql-test/suite/mariabackup/huge_lsn.opt new file mode 100644 index 00000000000..74a6450a1ef --- /dev/null +++ b/mysql-test/suite/mariabackup/huge_lsn.opt @@ -0,0 +1,6 @@ +--innodb-encrypt-log=ON +--plugin-load-add=$FILE_KEY_MANAGEMENT_SO +--loose-file-key-management +--loose-file-key-management-filekey=FILE:$MTR_SUITE_DIR/filekeys-data.key +--loose-file-key-management-filename=$MTR_SUITE_DIR/filekeys-data.enc +--loose-file-key-management-encryption-algorithm=aes_cbc diff --git a/mysql-test/suite/mariabackup/huge_lsn.result b/mysql-test/suite/mariabackup/huge_lsn.result index f8c4d3b5fb3..124f397f936 100644 --- a/mysql-test/suite/mariabackup/huge_lsn.result +++ b/mysql-test/suite/mariabackup/huge_lsn.result @@ -1,7 +1,7 @@ # # MDEV-13416 mariabackup fails with EFAULT "Bad Address" # -FOUND 1 /InnoDB: 5\.7\.\d+ started; log sequence number 17592186044428/ in mysqld.1.err +FOUND 1 /InnoDB: .*started; log sequence number 17596481010700/ in mysqld.1.err CREATE TABLE t(i INT) ENGINE INNODB; INSERT INTO t VALUES(1); # xtrabackup backup diff --git a/mysql-test/suite/mariabackup/huge_lsn.test b/mysql-test/suite/mariabackup/huge_lsn.test index 8b1ae338274..b35c44ffb03 100644 --- a/mysql-test/suite/mariabackup/huge_lsn.test +++ b/mysql-test/suite/mariabackup/huge_lsn.test @@ -16,7 +16,7 @@ binmode FILE; my $ps= $ENV{INNODB_PAGE_SIZE}; my $page; die "Unable to read $file" unless sysread(FILE, $page, $ps) == $ps; -substr($page,26,8) = pack("NN", 4096, 0); +substr($page,26,8) = pack("NN", 4096, ~1024); substr($page,0,4)=pack("N",0xdeadbeef); substr($page,$ps-8,4)=pack("N",0xdeadbeef); sysseek(FILE, 0, 0) || die "Unable to rewind $file\n"; @@ -28,7 +28,7 @@ EOF --source include/start_mysqld.inc let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err; ---let SEARCH_PATTERN= InnoDB: 5\.7\.\d+ started; log sequence number 17592186044428 +--let SEARCH_PATTERN= InnoDB: .*started; log sequence number 17596481010700 --source include/search_pattern_in_file.inc CREATE TABLE t(i INT) ENGINE INNODB; |