database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-8159 InnoDB: Failing assertion: key_state->key_id

Browse Source 
to simplify various checks, set crypt_data->key_id even
for not encrypted tablespaces
This commit is contained in:
Sergei Golubchik
2015-05-14 08:37:34 +02:00
parent 2300fe2e0e
commit a94cabd503
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/encryption/r/innodb-encr-threads.result Normal file
View File

@ -0,0 +1,7 @@
create table t1 (i int) engine=innodb;
set global innodb_encryption_threads = 1;
set global innodb_encryption_rotate_key_age = 2;
insert t1 values (1);
set global innodb_encryption_threads = 0;
set global innodb_encryption_rotate_key_age = 1;
drop table t1;

14
mysql-test/suite/encryption/t/innodb-encr-threads.test Normal file
View File

@ -0,0 +1,14 @@
--source include/have_innodb.inc
--source include/have_file_key_management_plugin.inc
#
# MDEV-8159 InnoDB: Failing assertion: key_state->key_id
#
create table t1 (i int) engine=innodb;
set global innodb_encryption_threads = 1;
set global innodb_encryption_rotate_key_age = 2;
insert t1 values (1);
set global innodb_encryption_threads = 0;
set global innodb_encryption_rotate_key_age = 1;
drop table t1;

2
storage/innobase/fil/fil0crypt.cc
View File

@ -203,7 +203,6 @@ fil_space_create_crypt_data(
crypt_data->min_key_version = 0; crypt_data->min_key_version = 0;
} else { } else {
crypt_data->type = CRYPT_SCHEME_1; crypt_data->type = CRYPT_SCHEME_1;
crypt_data->key_id = key_id;
crypt_data->min_key_version = encryption_key_get_latest_version(key_id); crypt_data->min_key_version = encryption_key_get_latest_version(key_id);
} }
@ -212,6 +211,7 @@ fil_space_create_crypt_data(
crypt_data->locker = crypt_data_scheme_locker; crypt_data->locker = crypt_data_scheme_locker;
my_random_bytes(crypt_data->iv, sizeof(crypt_data->iv)); my_random_bytes(crypt_data->iv, sizeof(crypt_data->iv));
crypt_data->encryption = FIL_SPACE_ENCRYPTION_DEFAULT; crypt_data->encryption = FIL_SPACE_ENCRYPTION_DEFAULT;
crypt_data->key_id = key_id;
return crypt_data; return crypt_data;
} }

2
storage/xtradb/fil/fil0crypt.cc
View File

@ -203,7 +203,6 @@ fil_space_create_crypt_data(
crypt_data->min_key_version = 0; crypt_data->min_key_version = 0;
} else { } else {
crypt_data->type = CRYPT_SCHEME_1; crypt_data->type = CRYPT_SCHEME_1;
crypt_data->key_id = key_id;
crypt_data->min_key_version = encryption_key_get_latest_version(key_id); crypt_data->min_key_version = encryption_key_get_latest_version(key_id);
} }
@ -212,6 +211,7 @@ fil_space_create_crypt_data(
crypt_data->locker = crypt_data_scheme_locker; crypt_data->locker = crypt_data_scheme_locker;
my_random_bytes(crypt_data->iv, sizeof(crypt_data->iv)); my_random_bytes(crypt_data->iv, sizeof(crypt_data->iv));
crypt_data->encryption = FIL_SPACE_ENCRYPTION_DEFAULT; crypt_data->encryption = FIL_SPACE_ENCRYPTION_DEFAULT;
crypt_data->key_id = key_id;
return crypt_data; return crypt_data;
} }