Skip to content

M
MariaDB
Commit 70a4659d authored by Eugene Kosov's avatar Eugene Kosov Committed by Aleksey Midenkov
Browse files
Options

Tests: result updates 

encryption.innodb_lotoftables
encryption.innodb_encryption
funcs_1.is_columns_mysql
parent fcbb672f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 38 deletions
mysql-test/suite/encryption/r/innodb_encryption.result
View file @ 70a4659d
...@@ -14,6 +14,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ ...@@ -14,6 +14,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
NAME NAME
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/vtmd_template
innodb_system innodb_system
# Success! # Success!
# Now turn off encryption and wait for threads to decrypt everything # Now turn off encryption and wait for threads to decrypt everything
...@@ -23,6 +24,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ ...@@ -23,6 +24,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
NAME NAME
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/vtmd_template
innodb_system innodb_system
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
...@@ -37,6 +39,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ ...@@ -37,6 +39,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
NAME NAME
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/vtmd_template
innodb_system innodb_system
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
...@@ -50,6 +53,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ ...@@ -50,6 +53,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
NAME NAME
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/vtmd_template
innodb_system innodb_system
# Success! # Success!
# Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0 # Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0
...@@ -64,6 +68,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_ ...@@ -64,6 +68,7 @@ SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_
NAME NAME
mysql/innodb_table_stats mysql/innodb_table_stats
mysql/innodb_index_stats mysql/innodb_index_stats
mysql/vtmd_template
innodb_system innodb_system
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
mysql-test/suite/encryption/r/innodb_lotoftables.result
View file @ 70a4659d
...@@ -10,13 +10,13 @@ create database innodb_encrypted_1; ...@@ -10,13 +10,13 @@ create database innodb_encrypted_1;
use innodb_encrypted_1; use innodb_encrypted_1;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 3 Innodb_pages0_read 4
set autocommit=0; set autocommit=0;
set autocommit=1; set autocommit=1;
commit work; commit work;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 3 Innodb_pages0_read 4
# should be empty # should be empty
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE NAME LIKE 'innodb_encrypted%'; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE NAME LIKE 'innodb_encrypted%';
NAME NAME
...@@ -24,13 +24,13 @@ create database innodb_encrypted_2; ...@@ -24,13 +24,13 @@ create database innodb_encrypted_2;
use innodb_encrypted_2; use innodb_encrypted_2;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 3 Innodb_pages0_read 4
set autocommit=0; set autocommit=0;
commit work; commit work;
set autocommit=1; set autocommit=1;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 3 Innodb_pages0_read 4
# should contain 100 tables # should contain 100 tables
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME;
NAME NAME
...@@ -141,13 +141,13 @@ create database innodb_encrypted_3; ...@@ -141,13 +141,13 @@ create database innodb_encrypted_3;
use innodb_encrypted_3; use innodb_encrypted_3;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 3 Innodb_pages0_read 4
set autocommit=0; set autocommit=0;
commit work; commit work;
set autocommit=1; set autocommit=1;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 3 Innodb_pages0_read 4
# should contain 100 tables # should contain 100 tables
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME;
NAME NAME
...@@ -357,7 +357,7 @@ innodb_encrypted_3/t_99 ...@@ -357,7 +357,7 @@ innodb_encrypted_3/t_99
use test; use test;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 3 Innodb_pages0_read 4
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME;
NAME NAME
innodb_encrypted_2/t_1 innodb_encrypted_2/t_1
...@@ -770,53 +770,53 @@ innodb_encrypted_3/t_98 ...@@ -770,53 +770,53 @@ innodb_encrypted_3/t_98
innodb_encrypted_3/t_99 innodb_encrypted_3/t_99
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 3 Innodb_pages0_read 4
# Success! # Success!
# Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0 # Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0
# Restart Success! # Restart Success!
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
use test; use test;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
use innodb_encrypted_1; use innodb_encrypted_1;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
use innodb_encrypted_2; use innodb_encrypted_2;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
use innodb_encrypted_3; use innodb_encrypted_3;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
use innodb_encrypted_1; use innodb_encrypted_1;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
use innodb_encrypted_2; use innodb_encrypted_2;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
use innodb_encrypted_3; use innodb_encrypted_3;
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
show status like 'innodb_pages0_read%'; show status like 'innodb_pages0_read%';
Variable_name Value Variable_name Value
Innodb_pages0_read 303 Innodb_pages0_read 304
SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME; SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME;
NAME NAME
innodb_encrypted_3/t_1 innodb_encrypted_3/t_1
......
mysql-test/suite/encryption/t/innodb_encryption.test
View file @ 70a4659d
...@@ -16,7 +16,7 @@ SET GLOBAL innodb_encrypt_tables = ON; ...@@ -16,7 +16,7 @@ SET GLOBAL innodb_encrypt_tables = ON;
--echo # Wait max 10 min for key encryption threads to encrypt all spaces --echo # Wait max 10 min for key encryption threads to encrypt all spaces
--let $wait_timeout= 600 --let $wait_timeout= 600
--let $wait_condition=SELECT COUNT(*) >= 3 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; --let $wait_condition=SELECT COUNT(*) >= 4 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
--source include/wait_condition.inc --source include/wait_condition.inc
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;
...@@ -59,7 +59,7 @@ SET GLOBAL innodb_encryption_threads=@start_global_value; ...@@ -59,7 +59,7 @@ SET GLOBAL innodb_encryption_threads=@start_global_value;
--echo # Wait max 10 min for key encryption threads to encrypt all spaces --echo # Wait max 10 min for key encryption threads to encrypt all spaces
--let $wait_timeout= 600 --let $wait_timeout= 600
--let $wait_condition=SELECT COUNT(*) >=3 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0; --let $wait_condition=SELECT COUNT(*) >=4 FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION <> 0;
--source include/wait_condition.inc --source include/wait_condition.inc
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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7