Merge 10.2 into 10.3

2 files changed, 34 insertions, 48 deletions

diff --git a/mysql-test/suite/encryption/r/innodb_lotoftables.result b/mysql-test/suite/encryption/r/innodb_lotoftables.result
index 9dadf13f039..45800c8cd0b 100644
--- a/mysql-test/suite/encryption/r/innodb_lotoftables.result
+++ b/mysql-test/suite/encryption/r/innodb_lotoftables.result
@@ -774,49 +774,37 @@ Innodb_pages0_read	4
 # Success!
 # Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0
 # Restart Success!
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
+variable_value <= 303
+1
 use test;
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
+variable_value <= 303
+1
 use innodb_encrypted_1;
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
+variable_value <= 303
+1
 use innodb_encrypted_2;
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
+variable_value <= 303
+1
 use innodb_encrypted_3;
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
+variable_value <= 303
+1
 use innodb_encrypted_1;
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
+variable_value <= 303
+1
 use innodb_encrypted_2;
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
+variable_value <= 303
+1
 use innodb_encrypted_3;
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
-show status like 'innodb_pages0_read%';
-Variable_name	Value
-Innodb_pages0_read	304
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
+variable_value <= 303
+1
 SELECT NAME FROM INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION WHERE MIN_KEY_VERSION = 0 AND NAME LIKE 'innodb_encrypted%' ORDER BY NAME;
 NAME
 innodb_encrypted_3/t_1
diff --git a/mysql-test/suite/encryption/t/innodb_lotoftables.test b/mysql-test/suite/encryption/t/innodb_lotoftables.test
index cd3c6a30c07..4ccdc7d5c49 100644
--- a/mysql-test/suite/encryption/t/innodb_lotoftables.test
+++ b/mysql-test/suite/encryption/t/innodb_lotoftables.test
@@ -148,20 +148,19 @@ show status like 'innodb_pages0_read%';
 -- source include/restart_mysqld.inc
 
 --echo # Restart Success!
-show status like 'innodb_pages0_read%';
 
-show status like 'innodb_pages0_read%';
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
 use test;
-show status like 'innodb_pages0_read%';
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
 use innodb_encrypted_1;
-show status like 'innodb_pages0_read%';
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
 use innodb_encrypted_2;
-show status like 'innodb_pages0_read%';
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
 use innodb_encrypted_3;
-show status like 'innodb_pages0_read%';
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
 
 use innodb_encrypted_1;
-show status like 'innodb_pages0_read%';
+
 --disable_result_log
 --disable_query_log
 let $tables = 100;
@@ -173,10 +172,9 @@ while ($tables)
 --enable_query_log
 --enable_result_log
 
-show status like 'innodb_pages0_read%';
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
 
 use innodb_encrypted_2;
-show status like 'innodb_pages0_read%';
 
 --disable_result_log
 --disable_query_log
@@ -189,10 +187,10 @@ while ($tables)
 --enable_query_log
 --enable_result_log
 
-show status like 'innodb_pages0_read%';
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
 
 use innodb_encrypted_3;
-show status like 'innodb_pages0_read%';
+
 --disable_result_log
 --disable_query_log
 let $tables = 100;
@@ -204,7 +202,7 @@ while ($tables)
 --enable_query_log
 --enable_result_log
 
-show status like 'innodb_pages0_read%';
+SELECT variable_value <= 303 FROM information_schema.global_status WHERE variable_name = 'innodb_pages0_read';
 
 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;