mirror of
https://github.com/MariaDB/server.git
synced 2025-08-23 03:54:27 +03:00
f9cc391863
This only merges MDEV-12253, adapting it to MDEV-12602 which is already
present in 10.2 but not yet in the 10.1 revision that is being merged.
TODO: Error handling in crash recovery needs to be improved.
If a page cannot be decrypted (or read), we should cleanly abort
the startup. If innodb_force_recovery is specified, we should
ignore the problematic page and apply redo log to other pages.
Currently, the test encryption.innodb-redo-badkey randomly fails
like this (the last messages are from cmake -DWITH_ASAN):
2017-05-05 10:19:40 140037071685504 [Note] InnoDB: Starting crash recovery from checkpoint LSN=1635994
2017-05-05 10:19:40 140037071685504 [ERROR] InnoDB: Missing MLOG_FILE_NAME or MLOG_FILE_DELETE before MLOG_CHECKPOINT for tablespace 1
2017-05-05 10:19:40 140037071685504 [ERROR] InnoDB: Plugin initialization aborted at srv0start.cc[2201] with error Data structure corruption
2017-05-05 10:19:41 140037071685504 [Note] InnoDB: Starting shutdown...
i=================================================================
==5226==ERROR: AddressSanitizer: attempting free on address which was not malloc()-ed: 0x612000018588 in thread T0
#0 0x736750 in operator delete(void*) (/mariadb/server/build/sql/mysqld+0x736750)
#1 0x1e4833f in LatchCounter::~LatchCounter() /mariadb/server/storage/innobase/include/sync0types.h:599:4
#2 0x1e480b8 in LatchMeta<LatchCounter>::~LatchMeta() /mariadb/server/storage/innobase/include/sync0types.h:786:17
#3 0x1e35509 in sync_latch_meta_destroy() /mariadb/server/storage/innobase/sync/sync0debug.cc:1622:3
#4 0x1e35314 in sync_check_close() /mariadb/server/storage/innobase/sync/sync0debug.cc:1839:2
#5 0x1dfdc18 in innodb_shutdown() /mariadb/server/storage/innobase/srv/srv0start.cc:2888:2
#6 0x197e5e6 in innobase_init(void*) /mariadb/server/storage/innobase/handler/ha_innodb.cc:4475:3
142 lines
4.8 KiB
Plaintext
142 lines
4.8 KiB
Plaintext
SET GLOBAL innodb_file_format = `Barracuda`;
|
|
SET GLOBAL innodb_file_per_table = ON;
|
|
CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;
|
|
CREATE TABLE t2 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB;
|
|
CREATE TABLE t3 (id INT, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;
|
|
CREATE TABLE t4 (id INT, a VARCHAR(255)) engine=InnoDB;
|
|
CREATE TABLE t5 (id INT NOT NULL PRIMARY KEY, a TEXT(500), b VARCHAR(255), FULLTEXT(b)) ENGINE=InnoDB encrypted=yes;
|
|
CREATE TABLE t6 (id INT, a TEXT(500), b VARCHAR(255), FULLTEXT(b)) ENGINE=InnoDB;
|
|
CREATE TABLE t7 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB row_format=compressed encrypted=yes;
|
|
create procedure innodb_insert_proc (repeat_count int)
|
|
begin
|
|
declare current_num int;
|
|
set current_num = 0;
|
|
while current_num < repeat_count do
|
|
insert into t1 values (current_num,repeat('foobar',12));
|
|
insert into t2 values (current_num,repeat('tempsecret', 12));
|
|
insert into t3 values (current_num,repeat('barfoo',42));
|
|
insert into t4 values (current_num,repeat('repeat',42));
|
|
insert into t5 values (current_num,substring('A BC DEF GHIJ KLM NOPQRS TUV WXYZ 012 3456789', rand()*36+1, 100), repeat('author new',22));
|
|
insert into t6 values (current_num,substring('A BC DEF GHIJ KLM NOPQRS TUV WXYZ 012 3456789', rand()*36+1, 100), repeat('mangled old',22));
|
|
insert into t7 values (current_num,repeat('mysql',42));
|
|
set current_num = current_num + 1;
|
|
end while;
|
|
end//
|
|
commit;
|
|
set autocommit=0;
|
|
call innodb_insert_proc(1500);
|
|
commit;
|
|
set autocommit=1;
|
|
# Wait max 10 min for key encryption threads to encrypt all spaces
|
|
# t1 yes on expecting NOT FOUND
|
|
NOT FOUND /foobar/ in t1.ibd
|
|
# t2 ... on expecting NOT FOUND
|
|
NOT FOUND /tempsecret/ in t2.ibd
|
|
# t3 ... on expecting NOT FOUND
|
|
NOT FOUND /barfoo/ in t3.ibd
|
|
# t4 ... on expecting NOT FOUND
|
|
NOT FOUND /repeat/ in t4.ibd
|
|
# t5 ... on expecting NOT FOUND
|
|
NOT FOUND /author/ in t5.ibd
|
|
# t6 ... on expecting NOT FOUND
|
|
NOT FOUND /mangled/ in t6.ibd
|
|
# t7 ... on expecting NOT FOUND
|
|
NOT FOUND /mysql/ in t7.ibd
|
|
SET GLOBAL innodb_file_format = `Barracuda`;
|
|
SET GLOBAL innodb_file_per_table = ON;
|
|
ALTER TABLE t1 ADD COLUMN b int default 2;
|
|
ALTER TABLE t2 ADD COLUMN b int default 2;
|
|
ALTER TABLE t7 ADD COLUMN b int default 2;
|
|
ALTER TABLE t1 ADD KEY a(a), ADD KEY b(b);
|
|
ALTER TABLE t2 ADD KEY a(a), ADD KEY b(b);
|
|
ALTER TABLE t3 ADD COLUMN c int default 5;
|
|
ALTER TABLE t4 ADD COLUMN c int default 5;
|
|
ALTER TABLE t3 ADD KEY (a), ADD KEY c(c);
|
|
ALTER TABLE t4 ADD KEY (a), ADD KEY c(c);
|
|
ALTER TABLE t5 ADD FULLTEXT(a);
|
|
ALTER TABLE t6 ADD FULLTEXT(a);
|
|
ALTER TABLE t7 ADD KEY a(a), ADD key b(b);
|
|
SHOW CREATE TABLE t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`id` int(11) NOT NULL,
|
|
`a` varchar(255) DEFAULT NULL,
|
|
`b` int(11) DEFAULT 2,
|
|
PRIMARY KEY (`id`),
|
|
KEY `a` (`a`),
|
|
KEY `b` (`b`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes
|
|
SHOW CREATE TABLE t2;
|
|
Table Create Table
|
|
t2 CREATE TABLE `t2` (
|
|
`id` int(11) NOT NULL,
|
|
`a` varchar(255) DEFAULT NULL,
|
|
`b` int(11) DEFAULT 2,
|
|
PRIMARY KEY (`id`),
|
|
KEY `a` (`a`),
|
|
KEY `b` (`b`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
SHOW CREATE TABLE t3;
|
|
Table Create Table
|
|
t3 CREATE TABLE `t3` (
|
|
`id` int(11) DEFAULT NULL,
|
|
`a` varchar(255) DEFAULT NULL,
|
|
`c` int(11) DEFAULT 5,
|
|
KEY `a` (`a`),
|
|
KEY `c` (`c`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes
|
|
SHOW CREATE TABLE t4;
|
|
Table Create Table
|
|
t4 CREATE TABLE `t4` (
|
|
`id` int(11) DEFAULT NULL,
|
|
`a` varchar(255) DEFAULT NULL,
|
|
`c` int(11) DEFAULT 5,
|
|
KEY `a` (`a`),
|
|
KEY `c` (`c`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
SHOW CREATE TABLE t5;
|
|
Table Create Table
|
|
t5 CREATE TABLE `t5` (
|
|
`id` int(11) NOT NULL,
|
|
`a` text DEFAULT NULL,
|
|
`b` varchar(255) DEFAULT NULL,
|
|
PRIMARY KEY (`id`),
|
|
FULLTEXT KEY `b` (`b`),
|
|
FULLTEXT KEY `a` (`a`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes
|
|
SHOW CREATE TABLE t6;
|
|
Table Create Table
|
|
t6 CREATE TABLE `t6` (
|
|
`id` int(11) DEFAULT NULL,
|
|
`a` text DEFAULT NULL,
|
|
`b` varchar(255) DEFAULT NULL,
|
|
FULLTEXT KEY `b` (`b`),
|
|
FULLTEXT KEY `a` (`a`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
SHOW CREATE TABLE t7;
|
|
Table Create Table
|
|
t7 CREATE TABLE `t7` (
|
|
`id` int(11) NOT NULL,
|
|
`a` varchar(255) DEFAULT NULL,
|
|
`b` int(11) DEFAULT 2,
|
|
PRIMARY KEY (`id`),
|
|
KEY `a` (`a`),
|
|
KEY `b` (`b`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED `encrypted`=yes
|
|
# t1 yes on expecting NOT FOUND
|
|
NOT FOUND /foobar/ in t1.ibd
|
|
# t2 ... on expecting NOT FOUND
|
|
NOT FOUND /tempsecret/ in t2.ibd
|
|
# t3 ... on expecting NOT FOUND
|
|
NOT FOUND /barfoo/ in t3.ibd
|
|
# t4 ... on expecting NOT FOUND
|
|
NOT FOUND /repeat/ in t4.ibd
|
|
# t5 ... on expecting NOT FOUND
|
|
NOT FOUND /author/ in t5.ibd
|
|
# t6 ... on expecting NOT FOUND
|
|
NOT FOUND /mangled/ in t6.ibd
|
|
# t7 ... on expecting NOT FOUND
|
|
NOT FOUND /mysql/ in t7.ibd
|
|
DROP PROCEDURE innodb_insert_proc;
|
|
DROP TABLE t1, t2, t3, t4, t5, t6, t7;
|