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

Remove restarts from encrypt_and_grep test

Browse Source
This commit is contained in:
Marko Mäkelä
2021-11-09 08:08:29 +02:00
parent 75f0c595d9
commit 8c7e551da1
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/encryption/r/encrypt_and_grep.result
View File

@ -19,6 +19,7 @@ mysql/innodb_index_stats
mysql/innodb_table_stats mysql/innodb_table_stats
test/t1 test/t1
test/t2 test/t2
FLUSH TABLES t1,t2,t3 FOR EXPORT;
# t1 yes on expecting NOT FOUND # t1 yes on expecting NOT FOUND
NOT FOUND /foobarsecret/ in t1.ibd NOT FOUND /foobarsecret/ in t1.ibd
# t2 ... on expecting NOT FOUND # t2 ... on expecting NOT FOUND
@ -27,6 +28,7 @@ NOT FOUND /tempsecret/ in t2.ibd
FOUND 12 /dummysecret/ in t3.ibd FOUND 12 /dummysecret/ in t3.ibd
# ibdata1 expecting NOT FOUND # ibdata1 expecting NOT FOUND
NOT FOUND /foobarsecret/ in ibdata1 NOT FOUND /foobarsecret/ in ibdata1
UNLOCK TABLES;
# Now turn off encryption and wait for threads to decrypt everything # Now turn off encryption and wait for threads to decrypt everything
SET GLOBAL innodb_encrypt_tables = off; SET GLOBAL innodb_encrypt_tables = off;
# Wait max 10 min for key encryption threads to decrypt all spaces # Wait max 10 min for key encryption threads to decrypt all spaces
@ -40,6 +42,7 @@ test/t3
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
NAME NAME
test/t1 test/t1
FLUSH TABLES t1,t2,t3 FOR EXPORT;
# t1 yes on expecting NOT FOUND # t1 yes on expecting NOT FOUND
NOT FOUND /foobarsecret/ in t1.ibd NOT FOUND /foobarsecret/ in t1.ibd
# t2 ... default expecting FOUND # t2 ... default expecting FOUND
@ -48,6 +51,7 @@ FOUND 12 /tempsecret/ in t2.ibd
FOUND 12 /dummysecret/ in t3.ibd FOUND 12 /dummysecret/ in t3.ibd
# ibdata1 expecting NOT FOUND # ibdata1 expecting NOT FOUND
NOT FOUND /foobarsecret/ in ibdata1 NOT FOUND /foobarsecret/ in ibdata1
UNLOCK TABLES;
# Now turn on encryption and wait for threads to encrypt all spaces # Now turn on encryption and wait for threads to encrypt all spaces
SET GLOBAL innodb_encrypt_tables = on; SET GLOBAL innodb_encrypt_tables = on;
# Wait max 10 min for key encryption threads to encrypt all spaces # Wait max 10 min for key encryption threads to encrypt all spaces
@ -61,6 +65,7 @@ mysql/innodb_index_stats
mysql/innodb_table_stats mysql/innodb_table_stats
test/t1 test/t1
test/t2 test/t2
FLUSH TABLES t1,t2,t3 FOR EXPORT;
# t1 yes on expecting NOT FOUND # t1 yes on expecting NOT FOUND
NOT FOUND /foobarsecret/ in t1.ibd NOT FOUND /foobarsecret/ in t1.ibd
# t2 ... on expecting NOT FOUND # t2 ... on expecting NOT FOUND
@ -69,4 +74,5 @@ NOT FOUND /tempsecret/ in t2.ibd
FOUND 12 /dummysecret/ in t3.ibd FOUND 12 /dummysecret/ in t3.ibd
# ibdata1 expecting NOT FOUND # ibdata1 expecting NOT FOUND
NOT FOUND /foobarsecret/ in ibdata1 NOT FOUND /foobarsecret/ in ibdata1
UNLOCK TABLES;
drop table t1, t2, t3; drop table t1, t2, t3;

16
mysql-test/suite/encryption/t/encrypt_and_grep.test
View File

@ -1,9 +1,6 @@
-- source include/have_innodb.inc -- source include/have_innodb.inc
-- source include/have_file_key_management_plugin.inc -- source include/have_file_key_management_plugin.inc
# embedded does not support restart
-- source include/not_embedded.inc
# #
# MDEV-8138: strange results from encrypt-and-grep test # MDEV-8138: strange results from encrypt-and-grep test
# #
@ -38,7 +35,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
--sorted_result --sorted_result
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
--source include/shutdown_mysqld.inc FLUSH TABLES t1,t2,t3 FOR EXPORT;
--let SEARCH_PATTERN=foobarsecret --let SEARCH_PATTERN=foobarsecret
--echo # t1 yes on expecting NOT FOUND --echo # t1 yes on expecting NOT FOUND
@ -57,7 +54,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
-- let SEARCH_FILE=$ib1_IBD -- let SEARCH_FILE=$ib1_IBD
-- source include/search_pattern_in_file.inc -- source include/search_pattern_in_file.inc
-- source include/start_mysqld.inc UNLOCK TABLES;
--echo # Now turn off encryption and wait for threads to decrypt everything --echo # Now turn off encryption and wait for threads to decrypt everything
@ -74,7 +71,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
--sorted_result --sorted_result
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
--source include/shutdown_mysqld.inc FLUSH TABLES t1,t2,t3 FOR EXPORT;
--let SEARCH_PATTERN=foobarsecret --let SEARCH_PATTERN=foobarsecret
--echo # t1 yes on expecting NOT FOUND --echo # t1 yes on expecting NOT FOUND
@ -93,8 +90,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
-- let SEARCH_FILE=$ib1_IBD -- let SEARCH_FILE=$ib1_IBD
-- source include/search_pattern_in_file.inc -- source include/search_pattern_in_file.inc
UNLOCK TABLES;
-- source include/start_mysqld.inc
--echo # Now turn on encryption and wait for threads to encrypt all spaces --echo # Now turn on encryption and wait for threads to encrypt all spaces
SET GLOBAL innodb_encrypt_tables = on; SET GLOBAL innodb_encrypt_tables = on;
@ -109,7 +105,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
--sorted_result --sorted_result
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
--source include/shutdown_mysqld.inc FLUSH TABLES t1,t2,t3 FOR EXPORT;
--let SEARCH_PATTERN=foobarsecret --let SEARCH_PATTERN=foobarsecret
--echo # t1 yes on expecting NOT FOUND --echo # t1 yes on expecting NOT FOUND
@ -128,6 +124,6 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
-- let SEARCH_FILE=$ib1_IBD -- let SEARCH_FILE=$ib1_IBD
-- source include/search_pattern_in_file.inc -- source include/search_pattern_in_file.inc
-- source include/start_mysqld.inc UNLOCK TABLES;
drop table t1, t2, t3; drop table t1, t2, t3;