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
131 lines
5.3 KiB
Plaintext
131 lines
5.3 KiB
Plaintext
SET GLOBAL innodb_file_format = `Barracuda`;
|
|
SET GLOBAL innodb_file_per_table = ON;
|
|
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
|
|
show warnings;
|
|
Level Code Message
|
|
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
|
|
show warnings;
|
|
Level Code Message
|
|
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encrypted=yes encryption_key_id=2;
|
|
show warnings;
|
|
Level Code Message
|
|
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=33;
|
|
show warnings;
|
|
Level Code Message
|
|
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
|
|
show warnings;
|
|
Level Code Message
|
|
show create table innodb_compact;
|
|
Table Create Table
|
|
innodb_compact CREATE TABLE `innodb_compact` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encrypted`=yes `encryption_key_id`=1
|
|
show create table innodb_compressed;
|
|
Table Create Table
|
|
innodb_compressed CREATE TABLE `innodb_compressed` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED `encrypted`=yes `encryption_key_id`=2
|
|
show create table innodb_dynamic;
|
|
Table Create Table
|
|
innodb_dynamic CREATE TABLE `innodb_dynamic` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encrypted`=yes `encryption_key_id`=33
|
|
show create table innodb_redundant;
|
|
Table Create Table
|
|
innodb_redundant CREATE TABLE `innodb_redundant` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `encrypted`=yes `encryption_key_id`=4
|
|
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 innodb_normal values(current_num, substring(MD5(RAND()), -64));
|
|
set current_num = current_num + 1;
|
|
end while;
|
|
end//
|
|
commit;
|
|
begin;
|
|
call innodb_insert_proc(2000);
|
|
insert into innodb_compact select * from innodb_normal;
|
|
insert into innodb_compressed select * from innodb_normal;
|
|
insert into innodb_dynamic select * from innodb_normal;
|
|
insert into innodb_redundant select * from innodb_normal;
|
|
commit;
|
|
SELECT variable_value > 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_encrypted';
|
|
variable_value > 0
|
|
1
|
|
SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
|
|
variable_value >= 0
|
|
1
|
|
SET GLOBAL innodb_file_format = `Barracuda`;
|
|
SET GLOBAL innodb_file_per_table = ON;
|
|
update innodb_normal set c1 = c1 +1;
|
|
update innodb_compact set c1 = c1 + 1;
|
|
update innodb_compressed set c1 = c1 + 1;
|
|
update innodb_dynamic set c1 = c1 + 1;
|
|
update innodb_redundant set c1 = c1 + 1;
|
|
SELECT variable_value > 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_encrypted';
|
|
variable_value > 0
|
|
1
|
|
SELECT variable_value > 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
|
|
variable_value > 0
|
|
1
|
|
SET GLOBAL innodb_encrypt_tables=OFF;
|
|
alter table innodb_compact engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_compact;
|
|
Table Create Table
|
|
innodb_compact CREATE TABLE `innodb_compact` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
|
|
alter table innodb_compressed engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_compressed;
|
|
Table Create Table
|
|
innodb_compressed CREATE TABLE `innodb_compressed` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED
|
|
alter table innodb_dynamic engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_dynamic;
|
|
Table Create Table
|
|
innodb_dynamic CREATE TABLE `innodb_dynamic` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
|
|
alter table innodb_redundant engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_redundant;
|
|
Table Create Table
|
|
innodb_redundant CREATE TABLE `innodb_redundant` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
|
|
SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_encrypted';
|
|
variable_value >= 0
|
|
1
|
|
SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
|
|
variable_value >= 0
|
|
1
|
|
drop procedure innodb_insert_proc;
|
|
drop table innodb_normal;
|
|
drop table innodb_compact;
|
|
drop table innodb_compressed;
|
|
drop table innodb_dynamic;
|
|
drop table innodb_redundant;
|
|
SET GLOBAL innodb_file_format = `Barracuda`;
|
|
Warnings:
|
|
Warning 131 Using innodb_file_format is deprecated and the parameter may be removed in future releases. See http://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html
|
|
SET GLOBAL innodb_file_per_table = ON;
|
|
CREATE TABLE t1 (pk INT PRIMARY KEY) ENGINE=InnoDB ENCRYPTION_KEY_ID=2 ENCRYPTED=YES;
|
|
INSERT INTO t1 VALUES (1),(2);
|
|
# Restarting server...
|
|
SELECT * FROM t1;
|
|
pk
|
|
1
|
|
2
|
|
DROP TABLE t1;
|