diff options
Diffstat (limited to 'mysql-test/suite/encryption/r')
14 files changed, 94 insertions, 341 deletions
diff --git a/mysql-test/suite/encryption/r/aria_tiny.result b/mysql-test/suite/encryption/r/aria_tiny.result index b0f8bac7c32..28f762255c4 100644 --- a/mysql-test/suite/encryption/r/aria_tiny.result +++ b/mysql-test/suite/encryption/r/aria_tiny.result @@ -1,5 +1,27 @@ -set global aria_encrypt_tables = 1; +SET @aria_encrypt= @@aria_encrypt_tables; +SET global aria_encrypt_tables=1; create table t1 (i int, key(i)) engine=aria; insert into t1 values (1); drop table t1; -set global aria_encrypt_tables = 0; +create table t1 (a int primary key, b int, c int, key(b),key(c)) engine=aria; +alter table t1 disable keys; +insert into t1 select seq,seq,seq from seq_1_to_100; +alter table t1 enable keys; +check table t1; +Table Op Msg_type Msg_text +test.t1 check status OK +drop table t1; +# +# MDEV CHECK on encrypted Aria table complains about "Wrong LSN" +# +CREATE TABLE t1 (f DATE PRIMARY KEY) ENGINE=Aria; +INSERT INTO t1 (f) VALUES ('1995-01-01'),('2000-01-01'); +DELETE FROM t1 WHERE f = '2000-01-01'; +OPTIMIZE TABLE t1; +Table Op Msg_type Msg_text +test.t1 optimize status OK +CHECK TABLE t1 EXTENDED; +Table Op Msg_type Msg_text +test.t1 check status OK +DROP TABLE t1; +set global aria_encrypt_tables=@aria_encrypt; diff --git a/mysql-test/suite/encryption/r/corrupted_during_recovery.result b/mysql-test/suite/encryption/r/corrupted_during_recovery.result index 356dce64f8d..ea2f1ff3328 100644 --- a/mysql-test/suite/encryption/r/corrupted_during_recovery.result +++ b/mysql-test/suite/encryption/r/corrupted_during_recovery.result @@ -1,3 +1,5 @@ +# Work around MDEV-19541 +SET GLOBAL innodb_checksum_algorithm=crc32; CREATE TABLE t1(a BIGINT PRIMARY KEY) ENGINE=InnoDB, ENCRYPTED=YES; INSERT INTO t1 VALUES(1); CREATE TABLE t2(a BIGINT PRIMARY KEY) ENGINE=InnoDB, ENCRYPTED=YES; diff --git a/mysql-test/suite/encryption/r/innodb-force-corrupt.result b/mysql-test/suite/encryption/r/innodb-force-corrupt.result index 012901010b4..ad75df952b3 100644 --- a/mysql-test/suite/encryption/r/innodb-force-corrupt.result +++ b/mysql-test/suite/encryption/r/innodb-force-corrupt.result @@ -1,7 +1,7 @@ call mtr.add_suppression("InnoDB: Table `test`\\.`t[13]` (has an unreadable root page|is corrupted)"); call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=\\d+, page number=[36]\\] in file .*test.t[123]\\.ibd looks corrupted; key_version="); call mtr.add_suppression("\\[ERROR\\] InnoDB: We detected index corruption in an InnoDB type table"); -call mtr.add_suppression("\\[ERROR\\] mysqld.*: Index for table 't2' is corrupt; try to repair it"); +call mtr.add_suppression("\\[ERROR\\] (mysqld|mariadbd).*: Index for table 't2' is corrupt; try to repair it"); SET GLOBAL innodb_file_per_table = ON; set global innodb_compression_algorithm = 1; # Create and populate tables to be corrupted diff --git a/mysql-test/suite/encryption/r/innodb-redo-badkey.result b/mysql-test/suite/encryption/r/innodb-redo-badkey.result index f90e7aeb780..87377a01479 100644 --- a/mysql-test/suite/encryption/r/innodb-redo-badkey.result +++ b/mysql-test/suite/encryption/r/innodb-redo-badkey.result @@ -1,10 +1,10 @@ call mtr.add_suppression("Plugin 'file_key_management'"); call mtr.add_suppression("Plugin 'InnoDB' init function returned error."); -call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[0-9]+\\] in file '.*test/t[1-4]\\.ibd' cannot be decrypted"); +call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[1-4]\\.ibd' cannot be decrypted"); call mtr.add_suppression("failed to read or decrypt \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\]"); call mtr.add_suppression("InnoDB: Unable to decompress .*.test.t[12]\\.ibd\\[page id: space=[1-9][0-9]*, page number=[0-9]+\\]"); -call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed file read of tablespace test/t[12] page \\[page id: space=[1-9][0-9]*, page number=[0-9]*\\]"); -call mtr.add_suppression("InnoDB: Failed to read file '.*' at offset .*"); +call mtr.add_suppression("InnoDB: Database page corruption on disk or a failed read of file '.*test.t[12]\\.ibd'"); +call mtr.add_suppression("InnoDB: Failed to read page .* from file '.*'"); call mtr.add_suppression("InnoDB: Plugin initialization aborted"); call mtr.add_suppression("Plugin 'InnoDB' registration as a STORAGE ENGINE failed"); call mtr.add_suppression("\\[ERROR\\] InnoDB: Cannot decrypt \\[page id: space="); diff --git a/mysql-test/suite/encryption/r/innodb-redo-nokeys.result b/mysql-test/suite/encryption/r/innodb-redo-nokeys.result index 0a6beb8da38..fe5324d7012 100644 --- a/mysql-test/suite/encryption/r/innodb-redo-nokeys.result +++ b/mysql-test/suite/encryption/r/innodb-redo-nokeys.result @@ -1,4 +1,4 @@ -call mtr.add_suppression("mysqld: File .*"); +call mtr.add_suppression("(mysqld|mariadbd).*: File .*"); call mtr.add_suppression("Plugin 'file_key_management' .*"); call mtr.add_suppression("InnoDB: cannot enable encryption, encryption plugin is not available"); call mtr.add_suppression("Plugin 'InnoDB' init function returned error\\."); diff --git a/mysql-test/suite/encryption/r/innodb-remove-encryption.result b/mysql-test/suite/encryption/r/innodb-remove-encryption.result index 9bce59dbbea..e241d213c8e 100644 --- a/mysql-test/suite/encryption/r/innodb-remove-encryption.result +++ b/mysql-test/suite/encryption/r/innodb-remove-encryption.result @@ -1,5 +1,5 @@ set global innodb_file_per_table=OFF; -call mtr.add_suppression("mysqld: file-key-management-filename is not set"); +call mtr.add_suppression("(mysqld|mariadbd).*: file-key-management-filename is not set"); call mtr.add_suppression("Plugin 'file_key_management' init function returned error."); call mtr.add_suppression("Plugin 'file_key_management' registration as a ENCRYPTION failed."); flush tables; diff --git a/mysql-test/suite/encryption/r/innodb-scrub-log.result b/mysql-test/suite/encryption/r/innodb-scrub-log.result deleted file mode 100644 index 8ea75000368..00000000000 --- a/mysql-test/suite/encryption/r/innodb-scrub-log.result +++ /dev/null @@ -1,3 +0,0 @@ -create table t1(a int not null primary key auto_increment, -b varchar(200), c char(100), d varchar(150)) engine=innodb; -DROP TABLE t1; diff --git a/mysql-test/suite/encryption/r/innodb_encrypt_freed.result b/mysql-test/suite/encryption/r/innodb_encrypt_freed.result index c0d8b770403..cdcdd17720e 100644 --- a/mysql-test/suite/encryption/r/innodb_encrypt_freed.result +++ b/mysql-test/suite/encryption/r/innodb_encrypt_freed.result @@ -20,7 +20,6 @@ mysql/transaction_registry test/t1 CREATE TABLE t2 (f1 int not null)engine=innodb; # restart: --debug=d,ib_log_checkpoint_avoid -SET GLOBAL innodb_log_checkpoint_now=TRUE; connect con1,localhost,root,,,; begin; insert into t2 values(1); @@ -48,7 +47,6 @@ test/t1 test/t2 disconnect con1; # restart: --debug=d,ib_log_checkpoint_avoid -SET GLOBAL innodb_log_checkpoint_now=TRUE; drop table t1, t2; CREATE TABLE t1(f1 BIGINT PRIMARY KEY, f2 int not null, f3 int not null, index(f1), index idx_1(f2), @@ -63,7 +61,6 @@ mysql/transaction_registry test/t1 CREATE TABLE t2 (f1 int not null)engine=innodb; # restart: --debug=d,ib_log_checkpoint_avoid -SET GLOBAL innodb_log_checkpoint_now=TRUE; connect con1,localhost,root,,,; begin; insert into t2 values(1); @@ -81,7 +78,6 @@ test/t2 alter table t1 drop index idx_1; disconnect con1; # restart: --debug=d,ib_log_checkpoint_avoid -SET GLOBAL innodb_log_checkpoint_now=TRUE; connect con1,localhost,root,,,; begin; insert into t2 values(1); diff --git a/mysql-test/suite/encryption/r/innodb_encrypt_log.result b/mysql-test/suite/encryption/r/innodb_encrypt_log.result index e2b456aa2ed..1a7a9267b60 100644 --- a/mysql-test/suite/encryption/r/innodb_encrypt_log.result +++ b/mysql-test/suite/encryption/r/innodb_encrypt_log.result @@ -7,7 +7,7 @@ # SET GLOBAL innodb_log_checksums=0; Warnings: -Warning 138 innodb_log_checksums is deprecated and has no effect outside recovery +Warning 138 The parameter innodb_log_checksums is deprecated and has no effect. SELECT @@global.innodb_log_checksums; @@global.innodb_log_checksums 1 @@ -40,7 +40,7 @@ NOT FOUND /private|secret|sacr(ed|ament)|success|story|secur(e|ity)/ in t0.ibd # ib_logfile0 expecting NOT FOUND NOT FOUND /private|secret|sacr(ed|ament)|success|story|secur(e|ity)/ in ib_logfile0 # Restart without redo log encryption -# restart: --skip-innodb-encrypt-log --innodb-log-files-in-group=1 +# restart: --skip-innodb-encrypt-log SELECT COUNT(*) FROM t0; COUNT(*) 1024 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 c64a11dcdd9..8d1eb447b03 100644 --- a/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result +++ b/mysql-test/suite/encryption/r/innodb_encrypt_log_corruption.result @@ -21,13 +21,54 @@ AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS FOUND 1 /InnoDB: Upgrade after a crash is not supported. This redo log was created before MariaDB 10\.2\.2, and it appears corrupted/ in mysqld.1.err # empty redo log from before 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=1m +# 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=2m 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 +# Corrupted multi-file redo log from before 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=2m +SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES +WHERE engine = 'innodb' +AND support IN ('YES', 'DEFAULT', 'ENABLED'); +COUNT(*) +0 +FOUND 2 /InnoDB: Upgrade after a crash is not supported. This redo log was created before MariaDB 10\.2\.2, and it appears corrupted/ in mysqld.1.err +# Empty multi-file redo log from before 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=2m +SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES +WHERE engine = 'innodb' +AND support IN ('YES', 'DEFAULT', 'ENABLED'); +COUNT(*) +1 +FOUND 2 /InnoDB: Upgrading redo log:/ in mysqld.1.err +# Multi-file redo log with size mismatch from after MariaDB 10.2.2 +# Corrupted 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=2m +SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES +WHERE engine = 'innodb' +AND support IN ('YES', 'DEFAULT', 'ENABLED'); +COUNT(*) +0 +FOUND 1 /InnoDB: Log file .*ib_logfile1 is of different size 1048576 bytes than other log files 2097152 bytes!/ in mysqld.1.err +FOUND 1 /InnoDB: Upgrade after a crash is not supported\. The redo log was created with BogoDB 1\.2\.3\.4, and it appears corrupted\./ in mysqld.1.err +# 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=2m +SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES +WHERE engine = 'innodb' +AND support IN ('YES', 'DEFAULT', 'ENABLED'); +COUNT(*) +0 +FOUND 2 /InnoDB: Upgrade after a crash is not supported\. The redo log was created with BogoDB 1\.2\.3\.4, and it appears corrupted\./ in mysqld.1.err +# Empty 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=2m +SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES +WHERE engine = 'innodb' +AND support IN ('YES', 'DEFAULT', 'ENABLED'); +COUNT(*) +1 +FOUND 3 /InnoDB: Upgrading redo log:/ in mysqld.1.err # redo log from "after" MariaDB 10.2.2, but with invalid header checksum # restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption SELECT * FROM INFORMATION_SCHEMA.ENGINES @@ -56,7 +97,7 @@ WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS FOUND 1 /InnoDB: Invalid log block checksum. block: 2372 checkpoint no: 1 expected: 3362026715 found: 144444122/ in mysqld.1.err -FOUND 1 /InnoDB: Missing MLOG_CHECKPOINT between the checkpoint 1213964 and the end 1213952\./ in mysqld.1.err +FOUND 1 /InnoDB: Upgrade after a crash is not supported\. The redo log was created with malicious intentions, or perhaps, and it appears corrupted\./ in mysqld.1.err # same, but with current-version header # 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 @@ -64,7 +105,6 @@ WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS FOUND 2 /InnoDB: Invalid log block checksum. block: 2372 checkpoint no: 1 expected: 3362026715 found: 144444122/ in mysqld.1.err -FOUND 2 /InnoDB: Missing MLOG_CHECKPOINT between the checkpoint 1213964 and the end 1213952\./ in mysqld.1.err # --innodb-force-recovery=6 (skip the entire 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=6 SELECT * FROM INFORMATION_SCHEMA.ENGINES @@ -93,12 +133,7 @@ SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS -FOUND 1 /InnoDB: Starting crash recovery from checkpoint LSN=1213964/ in mysqld.1.err -FOUND 1 /InnoDB: MLOG_FILE_NAME incorrect:bogus/ in mysqld.1.err -FOUND 1 /InnoDB: ############### CORRUPT LOG RECORD FOUND ##################/ in mysqld.1.err -FOUND 1 /InnoDB: Log record type 55, page 151:488\. Log parsing proceeded successfully up to 1213973\. Previous log record type 56, is multi 0 Recv offset 9, prev 0/ in mysqld.1.err -FOUND 1 /len 22. hex 38000000000012860cb7809781e80006626f67757300. asc 8 bogus / in mysqld.1.err -FOUND 1 /InnoDB: Set innodb_force_recovery to ignore this error/ in mysqld.1.err +FOUND 1 /\[ERROR\] InnoDB: Upgrade after a crash is not supported\. The redo log was created with MariaDB 10\.3\.1\./ in mysqld.1.err # Test a corrupted MLOG_FILE_NAME record. # valid header, invalid checkpoint 1, valid checkpoint 2, invalid block # restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption @@ -107,53 +142,52 @@ WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS FOUND 1 /InnoDB: Invalid log block checksum. block: 2372 checkpoint no: 1 expected: 2454333373 found: 150151/ in mysqld.1.err +FOUND 3 /\[ERROR\] InnoDB: Upgrade after a crash is not supported\. The redo log was created with MariaDB 10\.3\.1, and it appears corrupted\./ in mysqld.1.err # valid header, invalid checkpoint 1, valid checkpoint 2, invalid log record # restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS -FOUND 1 /InnoDB: MLOG_FILE_NAME incorrect:bigot/ in mysqld.1.err -FOUND 1 /len 22; hex 38000000000012860cb7809781e800066269676f7400; asc 8 bigot ;/ in mysqld.1.err +FOUND 2 /\[ERROR\] InnoDB: Upgrade after a crash is not supported\. The redo log was created with MariaDB 10\.3\.1\./ in mysqld.1.err # 10.2 missing MLOG_FILE_NAME or MLOG_FILE_DELETE before MLOG_CHECKPOINT # restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS -FOUND 1 /InnoDB: Missing MLOG_FILE_NAME or MLOG_FILE_DELETE before MLOG_CHECKPOINT for tablespace 42/ in mysqld.1.err +FOUND 1 /\[ERROR\] InnoDB: Upgrade after a crash is not supported\. The redo log was created with ibbackup was here!!!1!\./ in mysqld.1.err # 10.3 missing MLOG_FILE_NAME or MLOG_FILE_DELETE before MLOG_CHECKPOINT # restart: --innodb-data-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption --innodb-log-group-home-dir=MYSQLTEST_VARDIR/tmp/log_corruption SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS -FOUND 2 /InnoDB: Missing MLOG_FILE_NAME or MLOG_FILE_DELETE before MLOG_CHECKPOINT for tablespace 42/ in mysqld.1.err +FOUND 3 /\[ERROR\] InnoDB: Upgrade after a crash is not supported\. The redo log was created with MariaDB 10\.3\.1\./ in mysqld.1.err # Empty 10.3 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 --innodb-log-file-size=1m +# 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=2m SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); COUNT(*) 1 -FOUND 1 /InnoDB: .* started; log sequence number 121397[09]/ in mysqld.1.err +FOUND 1 /InnoDB: .* started; log sequence number 1213964; transaction id 0/ in mysqld.1.err # Empty 10.2 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 --innodb-log-file-size=1m +# 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=2m SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); COUNT(*) 1 -FOUND 3 /InnoDB: Upgrading redo log:/ in mysqld.1.err +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 COUNT(*) `1` FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED'); 1 1 -FOUND 1 /InnoDB: Encrypting redo log/ in mysqld.1.err +NOT FOUND /InnoDB: Encrypting redo log/ in mysqld.1.err # restart ib_buffer_pool ib_logfile0 -ib_logfile1 ibdata1 diff --git a/mysql-test/suite/encryption/r/innodb_import.result b/mysql-test/suite/encryption/r/innodb_import.result index 54b95ab26d4..169af37f404 100644 --- a/mysql-test/suite/encryption/r/innodb_import.result +++ b/mysql-test/suite/encryption/r/innodb_import.result @@ -11,10 +11,9 @@ UNLOCK TABLES; ALTER TABLE t2 IMPORT TABLESPACE; ERROR HY000: Internal error: Drop all secondary indexes before importing table test/t2 when .cfg file is missing. ALTER TABLE t2 DROP KEY idx; -Warnings: -Warning 1814 Tablespace has been discarded for table `t2` ALTER TABLE t2 IMPORT TABLESPACE; Warnings: +Warning 1814 Tablespace has been discarded for table `t2` Warning 1810 IO Read error: (2, No such file or directory) Error opening './test/t2.cfg', will attempt to import without schema verification SELECT * FROM t2; f1 f2 diff --git a/mysql-test/suite/encryption/r/innodb_scrub.result b/mysql-test/suite/encryption/r/innodb_scrub.result deleted file mode 100644 index 6e8febc762d..00000000000 --- a/mysql-test/suite/encryption/r/innodb_scrub.result +++ /dev/null @@ -1,138 +0,0 @@ -create table snapshot_status engine = myisam -select * from information_schema.global_status -where variable_name like 'innodb_scrub%'; -# MDEV-8139 Fix scrubbing tests -# FIXME: Add index(b) to each table; ensure that undo logs are scrubbed. -create table delete_3 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=compressed; -delete from delete_3; -create table delete_rollback_delete_3 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=compressed; -begin; -delete from delete_rollback_delete_3; -rollback; -delete from delete_rollback_delete_3; -create table insert_rollback_3 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=compressed; -begin; -rollback; -create table delete_2 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=compact; -delete from delete_2; -create table delete_rollback_delete_2 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=compact; -begin; -delete from delete_rollback_delete_2; -rollback; -delete from delete_rollback_delete_2; -create table insert_rollback_2 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=compact; -begin; -rollback; -create table delete_1 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=redundant; -delete from delete_1; -create table delete_rollback_delete_1 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=redundant; -begin; -delete from delete_rollback_delete_1; -rollback; -delete from delete_rollback_delete_1; -create table insert_rollback_1 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=redundant; -begin; -rollback; -create table delete_0 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=dynamic; -delete from delete_0; -create table delete_rollback_delete_0 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=dynamic; -begin; -delete from delete_rollback_delete_0; -rollback; -delete from delete_rollback_delete_0; -create table insert_rollback_0 ( -a int auto_increment primary key, -b varchar(256), -c text) engine = innodb row_format=dynamic; -begin; -rollback; -SET GLOBAL innodb_fast_shutdown=0; -# delete_3.ibd -# delete_rollback_delete_3.ibd -# insert_rollback_3.ibd -# delete_2.ibd -# delete_rollback_delete_2.ibd -# insert_rollback_2.ibd -# delete_1.ibd -# delete_rollback_delete_1.ibd -# insert_rollback_1.ibd -# delete_0.ibd -# delete_rollback_delete_0.ibd -# insert_rollback_0.ibd -check table delete_3, delete_rollback_delete_3, insert_rollback_3; -Table Op Msg_type Msg_text -test.delete_3 check status OK -test.delete_rollback_delete_3 check status OK -test.insert_rollback_3 check status OK -drop table delete_3, delete_rollback_delete_3, insert_rollback_3; -check table delete_2, delete_rollback_delete_2, insert_rollback_2; -Table Op Msg_type Msg_text -test.delete_2 check status OK -test.delete_rollback_delete_2 check status OK -test.insert_rollback_2 check status OK -drop table delete_2, delete_rollback_delete_2, insert_rollback_2; -check table delete_1, delete_rollback_delete_1, insert_rollback_1; -Table Op Msg_type Msg_text -test.delete_1 check status OK -test.delete_rollback_delete_1 check status OK -test.insert_rollback_1 check status OK -drop table delete_1, delete_rollback_delete_1, insert_rollback_1; -check table delete_0, delete_rollback_delete_0, insert_rollback_0; -Table Op Msg_type Msg_text -test.delete_0 check status OK -test.delete_rollback_delete_0 check status OK -test.insert_rollback_0 check status OK -drop table delete_0, delete_rollback_delete_0, insert_rollback_0; -show variables like 'innodb_%scrub_data%'; -Variable_name Value -innodb_background_scrub_data_check_interval 3600 -innodb_background_scrub_data_compressed OFF -innodb_background_scrub_data_interval 604800 -innodb_background_scrub_data_uncompressed OFF -innodb_immediate_scrub_data_uncompressed ON -# verify that this test have not caused any background scrubbing -select ss.variable_name, gs.variable_value - ss.variable_value as variable_value -from snapshot_status ss, -information_schema.global_status gs -where ss.variable_name = gs.variable_name; -variable_name variable_value -INNODB_SCRUB_BACKGROUND_PAGE_REORGANIZATIONS 0 -INNODB_SCRUB_BACKGROUND_PAGE_SPLITS 0 -INNODB_SCRUB_BACKGROUND_PAGE_SPLIT_FAILURES_MISSING_INDEX 0 -INNODB_SCRUB_BACKGROUND_PAGE_SPLIT_FAILURES_OUT_OF_FILESPACE 0 -INNODB_SCRUB_BACKGROUND_PAGE_SPLIT_FAILURES_UNDERFLOW 0 -INNODB_SCRUB_BACKGROUND_PAGE_SPLIT_FAILURES_UNKNOWN 0 -drop table snapshot_status; diff --git a/mysql-test/suite/encryption/r/innodb_scrub_background.result b/mysql-test/suite/encryption/r/innodb_scrub_background.result deleted file mode 100644 index 6a2f263d0a1..00000000000 --- a/mysql-test/suite/encryption/r/innodb_scrub_background.result +++ /dev/null @@ -1,160 +0,0 @@ -# -# immediate scrubbing is off -# background scrubbing is on -# -show variables like 'innodb_%scrub_data%'; -Variable_name Value -innodb_background_scrub_data_check_interval 3600 -innodb_background_scrub_data_compressed ON -innodb_background_scrub_data_interval 604800 -innodb_background_scrub_data_uncompressed ON -innodb_immediate_scrub_data_uncompressed OFF -# make sure spaces are checked quickly -SET GLOBAL innodb_background_scrub_data_check_interval=1; -create table delete_3 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=compressed; -# Populate table with rows -delete from delete_3; -create table delete_rollback_delete_3 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=compressed; -# Populate table with rows -begin; -delete from delete_rollback_delete_3; -rollback; -delete from delete_rollback_delete_3; -create table insert_rollback_3 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=compressed; -# Populate table with rows -begin; -rollback; -create table delete_2 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=compact; -# Populate table with rows -delete from delete_2; -create table delete_rollback_delete_2 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=compact; -# Populate table with rows -begin; -delete from delete_rollback_delete_2; -rollback; -delete from delete_rollback_delete_2; -create table insert_rollback_2 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=compact; -# Populate table with rows -begin; -rollback; -create table delete_1 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=redundant; -# Populate table with rows -delete from delete_1; -create table delete_rollback_delete_1 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=redundant; -# Populate table with rows -begin; -delete from delete_rollback_delete_1; -rollback; -delete from delete_rollback_delete_1; -create table insert_rollback_1 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=redundant; -# Populate table with rows -begin; -rollback; -create table delete_0 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=dynamic; -# Populate table with rows -delete from delete_0; -create table delete_rollback_delete_0 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=dynamic; -# Populate table with rows -begin; -delete from delete_rollback_delete_0; -rollback; -delete from delete_rollback_delete_0; -create table insert_rollback_0 ( -a int auto_increment primary key, -b varchar(256), -c text, -index(b)) engine = innodb row_format=dynamic; -# Populate table with rows -begin; -rollback; -# start scrubbing threads -SET GLOBAL innodb_encryption_threads=5; -# Wait max 10 min for scrubbing -SET GLOBAL innodb_fast_shutdown=0; -# delete_3.ibd -# delete_rollback_delete_3.ibd -# insert_rollback_3.ibd -# delete_2.ibd -# delete_rollback_delete_2.ibd -# insert_rollback_2.ibd -# delete_1.ibd -# delete_rollback_delete_1.ibd -# insert_rollback_1.ibd -# delete_0.ibd -# delete_rollback_delete_0.ibd -# insert_rollback_0.ibd -check table delete_3, delete_rollback_delete_3, insert_rollback_3; -Table Op Msg_type Msg_text -test.delete_3 check status OK -test.delete_rollback_delete_3 check status OK -test.insert_rollback_3 check status OK -drop table delete_3, delete_rollback_delete_3, insert_rollback_3; -check table delete_2, delete_rollback_delete_2, insert_rollback_2; -Table Op Msg_type Msg_text -test.delete_2 check status OK -test.delete_rollback_delete_2 check status OK -test.insert_rollback_2 check status OK -drop table delete_2, delete_rollback_delete_2, insert_rollback_2; -check table delete_1, delete_rollback_delete_1, insert_rollback_1; -Table Op Msg_type Msg_text -test.delete_1 check status OK -test.delete_rollback_delete_1 check status OK -test.insert_rollback_1 check status OK -drop table delete_1, delete_rollback_delete_1, insert_rollback_1; -check table delete_0, delete_rollback_delete_0, insert_rollback_0; -Table Op Msg_type Msg_text -test.delete_0 check status OK -test.delete_rollback_delete_0 check status OK -test.insert_rollback_0 check status OK -drop table delete_0, delete_rollback_delete_0, insert_rollback_0; -show variables like 'innodb_%scrub_data%'; -Variable_name Value -innodb_background_scrub_data_check_interval 3600 -innodb_background_scrub_data_compressed ON -innodb_background_scrub_data_interval 604800 -innodb_background_scrub_data_uncompressed ON -innodb_immediate_scrub_data_uncompressed OFF diff --git a/mysql-test/suite/encryption/r/tempfiles_encrypted.result b/mysql-test/suite/encryption/r/tempfiles_encrypted.result index dea3e4f0968..4cf31200ee2 100644 --- a/mysql-test/suite/encryption/r/tempfiles_encrypted.result +++ b/mysql-test/suite/encryption/r/tempfiles_encrypted.result @@ -1748,8 +1748,7 @@ drop table t1; # create table t1(a int); insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); -set @tmp=@@big_tables; -set big_tables=1; +set tmp_memory_table_size=0; select rank() over (order by a) from t1; rank() over (order by a) 1 @@ -1762,7 +1761,7 @@ rank() over (order by a) 8 9 10 -set big_tables=@tmp; +set tmp_memory_table_size=default; drop table t1; # # Check if "ORDER BY window_func" works @@ -3769,7 +3768,8 @@ ANALYZE "r_total_time_ms": "REPLACED", "r_used_priority_queue": false, "r_output_rows": 3, - "r_buffer_size": "REPLACED" + "r_buffer_size": "REPLACED", + "r_sort_mode": "sort_key,rowid" } }, "temporary_table": { @@ -3779,7 +3779,8 @@ ANALYZE "r_loops": 1, "rows": 3, "r_rows": 3, - "r_total_time_ms": "REPLACED", + "r_table_time_ms": "REPLACED", + "r_other_time_ms": "REPLACED", "filtered": 100, "r_filtered": 100 } |