mirror of
https://github.com/MariaDB/server.git
synced 2025-07-17 12:02:09 +03:00
c980350438
A message used to say "failed to read or decrypt"
but the "or decrypt" part was removed in
commit 0b47c126e3
without adjusting rarely needed error message suppressions in some
encryption tests.
Let us improve the error message so that it mentions the file name,
and adjust all error message suppressions in tests.
Thanks to Oleksandr Byelkin for noticing one test failure.
56 lines
2.2 KiB
Plaintext
56 lines
2.2 KiB
Plaintext
-- source include/have_innodb.inc
|
|
# embedded does not support restart
|
|
-- source include/not_embedded.inc
|
|
-- source filekeys_plugin_exists.inc
|
|
|
|
#
|
|
# MDEV-9559: Server without encryption configs crashes if selecting from an implicitly encrypted table
|
|
#
|
|
|
|
call mtr.add_suppression("InnoDB: Table `test`\\.`t[15]` (has an unreadable root page|is corrupted)");
|
|
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[15]\\.ibd' cannot be decrypted\\.");
|
|
call mtr.add_suppression("InnoDB: Recovery failed to read page");
|
|
call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=[1-9][0-9]*, page number=3\\] in file .*test.t[15].ibd looks corrupted; key_version=1");
|
|
call mtr.add_suppression("InnoDB: Table `test`\\.`t[15]` is corrupted");
|
|
|
|
# Suppression for builds where file_key_management plugin is linked statically
|
|
call mtr.add_suppression("Couldn't load plugins from 'file_key_management");
|
|
|
|
--let $restart_parameters=--innodb-encrypt-tables=ON --plugin-load-add=file_key_management --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
|
|
--source include/restart_mysqld.inc
|
|
|
|
create table t5 (
|
|
`intcol1` int(32) DEFAULT NULL,
|
|
`intcol2` int(32) DEFAULT NULL,
|
|
`charcol1` varchar(128) DEFAULT NULL,
|
|
`charcol2` varchar(128) DEFAULT NULL,
|
|
`charcol3` varchar(128) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
|
|
|
|
insert into t5 values (1,2,'maria','db','encryption');
|
|
|
|
CREATE TABLE `t1` (
|
|
`intcol1` int(32) DEFAULT NULL,
|
|
`intcol2` int(32) DEFAULT NULL,
|
|
`charcol1` varchar(128) DEFAULT NULL,
|
|
`charcol2` varchar(128) DEFAULT NULL,
|
|
`charcol3` varchar(128) DEFAULT NULL
|
|
) ENGINE=InnoDB;
|
|
|
|
insert into t1 values (1,2,'maria','db','encryption');
|
|
alter table t1 encrypted='yes' `encryption_key_id`=1;
|
|
|
|
--let $restart_parameters=--innodb-encrypt-tables=OFF
|
|
--source include/restart_mysqld.inc
|
|
|
|
--error ER_NO_SUCH_TABLE_IN_ENGINE
|
|
select * from t1;
|
|
--error ER_NO_SUCH_TABLE_IN_ENGINE
|
|
select * from t5;
|
|
|
|
--let $restart_parameters=--innodb-encrypt-tables=ON --plugin-load-add=file_key_management --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
|
|
--source include/restart_mysqld.inc
|
|
|
|
drop table t1;
|
|
drop table t5;
|