Skip to content

Commit 12343ce

Browse files
Allen Laibjornmu
authored andcommitted
WL#8548 InnoDB: Transparent data encryption
Fixed bug#22846854 AFTER UPGRADE FROM 5.7.11 TO 5.7.12 CANNOT CREATE ENCRYPTED (TDE) TABLES (cherry picked from commit b4b54a055450862c3c604bd11617b005438c4827)
1 parent eb5bc95 commit 12343ce

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

storage/innobase/os/os0file.cc

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8789,6 +8789,22 @@ Encryption::get_master_key(ulint* master_key_id, byte** master_key)
87898789
ret = my_key_fetch(key_name, &key_type, NULL,
87908790
reinterpret_cast<void**>(master_key),
87918791
&key_len);
8792+
8793+
/* For compitable with 5.7.11, we need to try to get master key with
8794+
server id when get master key failure. */
8795+
if (ret || *master_key == NULL) {
8796+
if (key_type) {
8797+
my_free(key_type);
8798+
}
8799+
8800+
memset(key_name, 0, ENCRYPTION_MASTER_KEY_NAME_MAX_LEN);
8801+
sprintf(key_name, "%s-%lu-%lu", ENCRYPTION_MASTER_KEY_PRIFIX,
8802+
server_id, *master_key_id);
8803+
8804+
ret = my_key_fetch(key_name, &key_type, NULL,
8805+
reinterpret_cast<void**>(master_key),
8806+
&key_len);
8807+
}
87928808
#ifdef UNIV_ENCRYPT_DEBUG
87938809
if (!ret && *master_key) {
87948810
fprintf(stderr, "Fetched master key:%lu ",

0 commit comments

Comments
 (0)