-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Write proper tests for MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SI…
…ZE bytes Introduce innodb_encrypt_log.combinations and prove that the encryption and decryption take place during both online ADD INDEX (WL#5266) and online table-rebuilding ALTER (WL#6625).
- Loading branch information
Showing
15 changed files
with
365 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
[crypt] | ||
innodb_encrypt_log=ON | ||
innodb_encryption_rotate_key_age=1 | ||
plugin_load_add=$DEBUG_KEY_MANAGEMENT_SO | ||
|
||
[clear] | ||
skip_innodb_encrypt_log |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# The goal of including this file is to enable innodb_encrypt_log combinations | ||
# (see include/innodb_encrypt_log.combinations) | ||
|
||
--source include/have_innodb.inc |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- innodb-index-online.result | ||
+++ innodb-index-online,crypt.reject | ||
@@ -260,7 +260,7 @@ | ||
@merge_encrypt_1>@merge_encrypt_0, @merge_decrypt_1>@merge_decrypt_0, | ||
@rowlog_encrypt_1>@rowlog_encrypt_0; | ||
sort_balance @merge_encrypt_1>@merge_encrypt_0 @merge_decrypt_1>@merge_decrypt_0 @rowlog_encrypt_1>@rowlog_encrypt_0 | ||
-0 0 0 0 | ||
+0 1 1 1 | ||
SET DEBUG_SYNC = 'now SIGNAL dml2_done'; | ||
ERROR HY000: Creating index 'c2e' required more than 'innodb_online_alter_log_max_size' bytes of modification log. Please try again. | ||
SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; | ||
@@ -364,7 +364,7 @@ | ||
@rowlog_encrypt_2-@rowlog_encrypt_1>0 as log_encrypted, | ||
@rowlog_decrypt_2-@rowlog_decrypt_1>0 as log_decrypted; | ||
sort_encrypted sort_decrypted log_encrypted log_decrypted | ||
-0 0 0 0 | ||
+1 1 1 1 | ||
SELECT COUNT(c22f) FROM t1; | ||
COUNT(c22f) | ||
320 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- innodb-table-online.result | ||
+++ innodb-table-online,crypt.reject | ||
@@ -254,7 +254,7 @@ | ||
@merge_encrypt_1>@merge_encrypt_0, @merge_decrypt_1>@merge_decrypt_0, | ||
@rowlog_encrypt_1>@rowlog_encrypt_0; | ||
sort_balance @merge_encrypt_1>@merge_encrypt_0 @merge_decrypt_1>@merge_decrypt_0 @rowlog_encrypt_1>@rowlog_encrypt_0 | ||
-0 0 0 0 | ||
+0 1 1 1 | ||
SET DEBUG_SYNC = 'now SIGNAL dml2_done'; | ||
# session con1 | ||
ERROR HY000: Creating index 'PRIMARY' required more than 'innodb_online_alter_log_max_size' bytes of modification log. Please try again. | ||
@@ -345,7 +345,7 @@ | ||
@rowlog_encrypt_2-@rowlog_encrypt_1>0 as log_encrypted, | ||
@rowlog_decrypt_2-@rowlog_decrypt_1>0 as log_decrypted; | ||
sort_encrypted sort_decrypted log_encrypted log_decrypted | ||
-0 0 0 0 | ||
+1 1 1 1 | ||
ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY c3p5(c3(5)); | ||
ERROR 23000: Duplicate entry '' for key 'PRIMARY' | ||
UPDATE t1 SET c3 = NULL WHERE c3 = ''; |
Oops, something went wrong.