inikep · inikep · Aug 28, 2023 · Aug 23, 2023 · Aug 23, 2023 · Aug 23, 2023
diff --git a/mysql-test/collections/disabled.def b/mysql-test/collections/disabled.def
@@ -56,7 +56,6 @@ component_keyring_file.mysql_ts_alter_encrypt_1 : BUG#29531106 - ATTACHABLE_TRX(
 
 # main suite tests
 main.ds_mrr-big @solaris : BUG#14168107 Test leads to timeout on Solaris on slow sparc servers.
-main.bug100352 : BUG#100352 https://bugs.mysql.com/bug.php?id=100352
 main.gtid_next_xa_binlog_off : BUG#33650776 Failure of XA COMMIT of prepared txn, can result in txn rollback
 
 # Disabled due to InnoDB issues
@@ -78,6 +77,9 @@ max_parts.partition_max_sub_parts_list_innodb @windows      : BUG#27681900 Disab
 max_parts.partition_max_sub_parts_range_innodb @windows     : BUG#27681900 Disabling max_parts tests on windows.
 max_parts.innodb_partition_open_files_limit                 : BUG#27423163 Test times out consistently on Hudson.
 
+# percona suite test
+percona.bug100352 : BUG#100352 https://bugs.mysql.com/bug.php?id=100352
+
 # perfschema suite test
 perfschema.threads_history      : BUG#27712231
 perfschema.ssl                  : BUG#30910698

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
@@ -297,6 +297,9 @@ sub set_term_args {
 
   audit_log_filter
   binlog_57_decryption
+  component_encryption_udf
+  percona
+  percona_innodb
   percona-pam-for-mysql
   data_masking
   procfs

diff --git a/...est/include/percona_encryption_udf_dh.inc → ...ryption_udf/include/encryption_udf_dh.inc b/...est/include/percona_encryption_udf_dh.inc → ...ryption_udf/include/encryption_udf_dh.inc
diff --git a/...e/percona_encryption_udf_digest_table.inc → ...f/include/encryption_udf_digest_table.inc b/...e/percona_encryption_udf_digest_table.inc → ...f/include/encryption_udf_digest_table.inc
diff --git a/...st/include/percona_encryption_udf_xsa.inc → ...yption_udf/include/encryption_udf_xsa.inc b/...st/include/percona_encryption_udf_xsa.inc → ...yption_udf/include/encryption_udf_xsa.inc
@@ -4,7 +4,7 @@
 INSTALL COMPONENT 'file://component_encryption_udf';
 
 --let $include_digests_with_no_ans1_ids = 0
---source include/percona_encryption_udf_digest_table.inc
+--source ../include/encryption_udf_digest_table.inc
 
 --echo
 --echo ** checking private key generation, public key derivation, encryption/decryption and sign/verify functionality

diff --git a/...cona_encryption_udf_bits_threshold.result → ...df/r/encryption_udf_bits_threshold.result b/...cona_encryption_udf_bits_threshold.result → ...df/r/encryption_udf_bits_threshold.result
diff --git a/...t/r/percona_encryption_udf_dh_1024.result → ...ption_udf/r/encryption_udf_dh_1024.result b/...t/r/percona_encryption_udf_dh_1024.result → ...ption_udf/r/encryption_udf_dh_1024.result
diff --git a/...percona_encryption_udf_dh_1024_ext.result → ...n_udf/r/encryption_udf_dh_1024_ext.result b/...percona_encryption_udf_dh_1024_ext.result → ...n_udf/r/encryption_udf_dh_1024_ext.result
diff --git a/...t/r/percona_encryption_udf_dh_4096.result → ...ption_udf/r/encryption_udf_dh_4096.result b/...t/r/percona_encryption_udf_dh_4096.result → ...ption_udf/r/encryption_udf_dh_4096.result
diff --git a/...percona_encryption_udf_dh_4096_ext.result → ...n_udf/r/encryption_udf_dh_4096_ext.result b/...percona_encryption_udf_dh_4096_ext.result → ...n_udf/r/encryption_udf_dh_4096_ext.result
diff --git a/...r/percona_encryption_udf_dh_sanity.result → ...ion_udf/r/encryption_udf_dh_sanity.result b/...r/percona_encryption_udf_dh_sanity.result → ...ion_udf/r/encryption_udf_dh_sanity.result
diff --git a/...t/r/percona_encryption_udf_digests.result → ...ption_udf/r/encryption_udf_digests.result b/...t/r/percona_encryption_udf_digests.result → ...ption_udf/r/encryption_udf_digests.result
diff --git a/...cona_encryption_udf_digests_sanity.result → ...df/r/encryption_udf_digests_sanity.result b/...cona_encryption_udf_digests_sanity.result → ...df/r/encryption_udf_digests_sanity.result
diff --git a/.../r/percona_encryption_udf_dsa_1024.result → ...tion_udf/r/encryption_udf_dsa_1024.result b/.../r/percona_encryption_udf_dsa_1024.result → ...tion_udf/r/encryption_udf_dsa_1024.result
diff --git a/...ercona_encryption_udf_dsa_1024_ext.result → ..._udf/r/encryption_udf_dsa_1024_ext.result b/...ercona_encryption_udf_dsa_1024_ext.result → ..._udf/r/encryption_udf_dsa_1024_ext.result
diff --git a/.../r/percona_encryption_udf_dsa_4096.result → ...tion_udf/r/encryption_udf_dsa_4096.result b/.../r/percona_encryption_udf_dsa_4096.result → ...tion_udf/r/encryption_udf_dsa_4096.result
diff --git a/...ercona_encryption_udf_dsa_4096_ext.result → ..._udf/r/encryption_udf_dsa_4096_ext.result b/...ercona_encryption_udf_dsa_4096_ext.result → ..._udf/r/encryption_udf_dsa_4096_ext.result
diff --git a/.../r/percona_encryption_udf_dsa_9984.result → ...tion_udf/r/encryption_udf_dsa_9984.result b/.../r/percona_encryption_udf_dsa_9984.result → ...tion_udf/r/encryption_udf_dsa_9984.result
diff --git a/...ercona_encryption_udf_dsa_9984_ext.result → ..._udf/r/encryption_udf_dsa_9984_ext.result b/...ercona_encryption_udf_dsa_9984_ext.result → ..._udf/r/encryption_udf_dsa_9984_ext.result
diff --git a/.../percona_encryption_udf_kill_debug.result → ...on_udf/r/encryption_udf_kill_debug.result b/.../percona_encryption_udf_kill_debug.result → ...on_udf/r/encryption_udf_kill_debug.result
diff --git a/.../r/percona_encryption_udf_rsa_1024.result → ...tion_udf/r/encryption_udf_rsa_1024.result b/.../r/percona_encryption_udf_rsa_1024.result → ...tion_udf/r/encryption_udf_rsa_1024.result
diff --git a/...ercona_encryption_udf_rsa_1024_ext.result → ..._udf/r/encryption_udf_rsa_1024_ext.result b/...ercona_encryption_udf_rsa_1024_ext.result → ..._udf/r/encryption_udf_rsa_1024_ext.result
diff --git a/...r/percona_encryption_udf_rsa_16384.result → ...ion_udf/r/encryption_udf_rsa_16384.result b/...r/percona_encryption_udf_rsa_16384.result → ...ion_udf/r/encryption_udf_rsa_16384.result
diff --git a/...rcona_encryption_udf_rsa_16384_ext.result → ...udf/r/encryption_udf_rsa_16384_ext.result b/...rcona_encryption_udf_rsa_16384_ext.result → ...udf/r/encryption_udf_rsa_16384_ext.result
diff --git a/.../r/percona_encryption_udf_rsa_4096.result → ...tion_udf/r/encryption_udf_rsa_4096.result b/.../r/percona_encryption_udf_rsa_4096.result → ...tion_udf/r/encryption_udf_rsa_4096.result
diff --git a/...ercona_encryption_udf_rsa_4096_ext.result → ..._udf/r/encryption_udf_rsa_4096_ext.result b/...ercona_encryption_udf_rsa_4096_ext.result → ..._udf/r/encryption_udf_rsa_4096_ext.result
diff --git a/.../percona_encryption_udf_xsa_sanity.result → ...on_udf/r/encryption_udf_xsa_sanity.result b/.../percona_encryption_udf_xsa_sanity.result → ...on_udf/r/encryption_udf_xsa_sanity.result
diff --git a/..._encryption_udf_bits_threshold-master.opt → .../encryption_udf_bits_threshold-master.opt b/..._encryption_udf_bits_threshold-master.opt → .../encryption_udf_bits_threshold-master.opt
diff --git a/...ercona_encryption_udf_bits_threshold.test → ..._udf/t/encryption_udf_bits_threshold.test b/...ercona_encryption_udf_bits_threshold.test → ..._udf/t/encryption_udf_bits_threshold.test
diff --git a/...percona_encryption_udf_dh_1024-master.opt → ...n_udf/t/encryption_udf_dh_1024-master.opt b/...percona_encryption_udf_dh_1024-master.opt → ...n_udf/t/encryption_udf_dh_1024-master.opt
diff --git a/...est/t/percona_encryption_udf_dh_1024.test → ...ryption_udf/t/encryption_udf_dh_1024.test b/...est/t/percona_encryption_udf_dh_1024.test → ...ryption_udf/t/encryption_udf_dh_1024.test
@@ -2,4 +2,4 @@
 
 --let $key_length = 1024
 
---source include/percona_encryption_udf_dh.inc
+--source ../include/encryption_udf_dh.inc
diff --git a/...ona_encryption_udf_dh_1024_ext-master.opt → ...f/t/encryption_udf_dh_1024_ext-master.opt b/...ona_encryption_udf_dh_1024_ext-master.opt → ...f/t/encryption_udf_dh_1024_ext-master.opt
diff --git a/...t/percona_encryption_udf_dh_1024_ext.test → ...ion_udf/t/encryption_udf_dh_1024_ext.test b/...t/percona_encryption_udf_dh_1024_ext.test → ...ion_udf/t/encryption_udf_dh_1024_ext.test
@@ -5,4 +5,4 @@
 --let $key_length = 1024
 --let $use_openssl_binary = 1
 
---source include/percona_encryption_udf_dh.inc
+--source ../include/encryption_udf_dh.inc
diff --git a/...percona_encryption_udf_dh_4096-master.opt → ...n_udf/t/encryption_udf_dh_4096-master.opt b/...percona_encryption_udf_dh_4096-master.opt → ...n_udf/t/encryption_udf_dh_4096-master.opt
diff --git a/...est/t/percona_encryption_udf_dh_4096.test → ...ryption_udf/t/encryption_udf_dh_4096.test b/...est/t/percona_encryption_udf_dh_4096.test → ...ryption_udf/t/encryption_udf_dh_4096.test
@@ -3,4 +3,4 @@
 
 --let $key_length = 4096
 
---source include/percona_encryption_udf_dh.inc
+--source ../include/encryption_udf_dh.inc
diff --git a/...ona_encryption_udf_dh_4096_ext-master.opt → ...f/t/encryption_udf_dh_4096_ext-master.opt b/...ona_encryption_udf_dh_4096_ext-master.opt → ...f/t/encryption_udf_dh_4096_ext-master.opt
diff --git a/...t/percona_encryption_udf_dh_4096_ext.test → ...ion_udf/t/encryption_udf_dh_4096_ext.test b/...t/percona_encryption_udf_dh_4096_ext.test → ...ion_udf/t/encryption_udf_dh_4096_ext.test
@@ -6,4 +6,4 @@
 --let $key_length = 4096
 --let $use_openssl_binary = 1
 
---source include/percona_encryption_udf_dh.inc
+--source ../include/encryption_udf_dh.inc
diff --git a/...rcona_encryption_udf_dh_sanity-master.opt → ...udf/t/encryption_udf_dh_sanity-master.opt b/...rcona_encryption_udf_dh_sanity-master.opt → ...udf/t/encryption_udf_dh_sanity-master.opt
diff --git a/...t/t/percona_encryption_udf_dh_sanity.test → ...ption_udf/t/encryption_udf_dh_sanity.test b/...t/t/percona_encryption_udf_dh_sanity.test → ...ption_udf/t/encryption_udf_dh_sanity.test
diff --git a/...percona_encryption_udf_digests-master.opt → ...n_udf/t/encryption_udf_digests-master.opt b/...percona_encryption_udf_digests-master.opt → ...n_udf/t/encryption_udf_digests-master.opt
diff --git a/...est/t/percona_encryption_udf_digests.test → ...ryption_udf/t/encryption_udf_digests.test b/...est/t/percona_encryption_udf_digests.test → ...ryption_udf/t/encryption_udf_digests.test
@@ -9,7 +9,7 @@ INSTALL COMPONENT 'file://component_encryption_udf';
 eval SET @random_pattern = REPEAT(MD5(42), $number_of_length_iterations * $length_increment DIV 32 + 1);
 
 --let $include_digests_with_no_ans1_ids = 1
---source include/percona_encryption_udf_digest_table.inc
+--source ../include/encryption_udf_digest_table.inc
 
 --disable_query_log
 --let $digest_type_idx = 1

diff --git a/..._encryption_udf_digests_sanity-master.opt → .../encryption_udf_digests_sanity-master.opt b/..._encryption_udf_digests_sanity-master.opt → .../encryption_udf_digests_sanity-master.opt
diff --git a/...ercona_encryption_udf_digests_sanity.test → ..._udf/t/encryption_udf_digests_sanity.test b/...ercona_encryption_udf_digests_sanity.test → ..._udf/t/encryption_udf_digests_sanity.test
diff --git a/...ercona_encryption_udf_dsa_1024-master.opt → ..._udf/t/encryption_udf_dsa_1024-master.opt b/...ercona_encryption_udf_dsa_1024-master.opt → ..._udf/t/encryption_udf_dsa_1024-master.opt
diff --git a/...st/t/percona_encryption_udf_dsa_1024.test → ...yption_udf/t/encryption_udf_dsa_1024.test b/...st/t/percona_encryption_udf_dsa_1024.test → ...yption_udf/t/encryption_udf_dsa_1024.test
@@ -3,4 +3,4 @@
 --let $algorithm = DSA
 --let $key_length = 1024
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...na_encryption_udf_dsa_1024_ext-master.opt → .../t/encryption_udf_dsa_1024_ext-master.opt b/...na_encryption_udf_dsa_1024_ext-master.opt → .../t/encryption_udf_dsa_1024_ext-master.opt
diff --git a/.../percona_encryption_udf_dsa_1024_ext.test → ...on_udf/t/encryption_udf_dsa_1024_ext.test b/.../percona_encryption_udf_dsa_1024_ext.test → ...on_udf/t/encryption_udf_dsa_1024_ext.test
@@ -6,4 +6,4 @@
 --let $key_length = 1024
 --let $use_openssl_binary = 1
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...ercona_encryption_udf_dsa_4096-master.opt → ..._udf/t/encryption_udf_dsa_4096-master.opt b/...ercona_encryption_udf_dsa_4096-master.opt → ..._udf/t/encryption_udf_dsa_4096-master.opt
diff --git a/...st/t/percona_encryption_udf_dsa_4096.test → ...yption_udf/t/encryption_udf_dsa_4096.test b/...st/t/percona_encryption_udf_dsa_4096.test → ...yption_udf/t/encryption_udf_dsa_4096.test
@@ -3,4 +3,4 @@
 --let $algorithm = DSA
 --let $key_length = 4096
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...na_encryption_udf_dsa_4096_ext-master.opt → .../t/encryption_udf_dsa_4096_ext-master.opt b/...na_encryption_udf_dsa_4096_ext-master.opt → .../t/encryption_udf_dsa_4096_ext-master.opt
diff --git a/.../percona_encryption_udf_dsa_4096_ext.test → ...on_udf/t/encryption_udf_dsa_4096_ext.test b/.../percona_encryption_udf_dsa_4096_ext.test → ...on_udf/t/encryption_udf_dsa_4096_ext.test
@@ -6,4 +6,4 @@
 --let $key_length = 4096
 --let $use_openssl_binary = 1
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...ercona_encryption_udf_dsa_9984-master.opt → ..._udf/t/encryption_udf_dsa_9984-master.opt b/...ercona_encryption_udf_dsa_9984-master.opt → ..._udf/t/encryption_udf_dsa_9984-master.opt
diff --git a/...st/t/percona_encryption_udf_dsa_9984.test → ...yption_udf/t/encryption_udf_dsa_9984.test b/...st/t/percona_encryption_udf_dsa_9984.test → ...yption_udf/t/encryption_udf_dsa_9984.test
@@ -4,4 +4,4 @@
 --let $algorithm = DSA
 --let $key_length = 9984
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...na_encryption_udf_dsa_9984_ext-master.opt → .../t/encryption_udf_dsa_9984_ext-master.opt b/...na_encryption_udf_dsa_9984_ext-master.opt → .../t/encryption_udf_dsa_9984_ext-master.opt
diff --git a/.../percona_encryption_udf_dsa_9984_ext.test → ...on_udf/t/encryption_udf_dsa_9984_ext.test b/.../percona_encryption_udf_dsa_9984_ext.test → ...on_udf/t/encryption_udf_dsa_9984_ext.test
@@ -7,4 +7,4 @@
 --let $key_length = 9984
 --let $use_openssl_binary = 1
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...cona_encryption_udf_kill_debug-master.opt → ...df/t/encryption_udf_kill_debug-master.opt b/...cona_encryption_udf_kill_debug-master.opt → ...df/t/encryption_udf_kill_debug-master.opt
diff --git a/.../t/percona_encryption_udf_kill_debug.test → ...tion_udf/t/encryption_udf_kill_debug.test b/.../t/percona_encryption_udf_kill_debug.test → ...tion_udf/t/encryption_udf_kill_debug.test
diff --git a/...ercona_encryption_udf_rsa_1024-master.opt → ..._udf/t/encryption_udf_rsa_1024-master.opt b/...ercona_encryption_udf_rsa_1024-master.opt → ..._udf/t/encryption_udf_rsa_1024-master.opt
diff --git a/...st/t/percona_encryption_udf_rsa_1024.test → ...yption_udf/t/encryption_udf_rsa_1024.test b/...st/t/percona_encryption_udf_rsa_1024.test → ...yption_udf/t/encryption_udf_rsa_1024.test
@@ -3,4 +3,4 @@
 --let $algorithm = RSA
 --let $key_length = 1024
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...na_encryption_udf_rsa_1024_ext-master.opt → .../t/encryption_udf_rsa_1024_ext-master.opt b/...na_encryption_udf_rsa_1024_ext-master.opt → .../t/encryption_udf_rsa_1024_ext-master.opt
diff --git a/.../percona_encryption_udf_rsa_1024_ext.test → ...on_udf/t/encryption_udf_rsa_1024_ext.test b/.../percona_encryption_udf_rsa_1024_ext.test → ...on_udf/t/encryption_udf_rsa_1024_ext.test
@@ -6,4 +6,4 @@
 --let $key_length = 1024
 --let $use_openssl_binary = 1
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...rcona_encryption_udf_rsa_16384-master.opt → ...udf/t/encryption_udf_rsa_16384-master.opt b/...rcona_encryption_udf_rsa_16384-master.opt → ...udf/t/encryption_udf_rsa_16384-master.opt
diff --git a/...t/t/percona_encryption_udf_rsa_16384.test → ...ption_udf/t/encryption_udf_rsa_16384.test b/...t/t/percona_encryption_udf_rsa_16384.test → ...ption_udf/t/encryption_udf_rsa_16384.test
@@ -4,4 +4,4 @@
 --let $algorithm = RSA
 --let $key_length = 16384
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...a_encryption_udf_rsa_16384_ext-master.opt → ...t/encryption_udf_rsa_16384_ext-master.opt b/...a_encryption_udf_rsa_16384_ext-master.opt → ...t/encryption_udf_rsa_16384_ext-master.opt
diff --git a/...percona_encryption_udf_rsa_16384_ext.test → ...n_udf/t/encryption_udf_rsa_16384_ext.test b/...percona_encryption_udf_rsa_16384_ext.test → ...n_udf/t/encryption_udf_rsa_16384_ext.test
@@ -7,4 +7,4 @@
 --let $key_length = 16384
 --let $use_openssl_binary = 1
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...ercona_encryption_udf_rsa_4096-master.opt → ..._udf/t/encryption_udf_rsa_4096-master.opt b/...ercona_encryption_udf_rsa_4096-master.opt → ..._udf/t/encryption_udf_rsa_4096-master.opt
diff --git a/...st/t/percona_encryption_udf_rsa_4096.test → ...yption_udf/t/encryption_udf_rsa_4096.test b/...st/t/percona_encryption_udf_rsa_4096.test → ...yption_udf/t/encryption_udf_rsa_4096.test
@@ -3,4 +3,4 @@
 --let $algorithm = RSA
 --let $key_length = 4096
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...na_encryption_udf_rsa_4096_ext-master.opt → .../t/encryption_udf_rsa_4096_ext-master.opt b/...na_encryption_udf_rsa_4096_ext-master.opt → .../t/encryption_udf_rsa_4096_ext-master.opt
diff --git a/.../percona_encryption_udf_rsa_4096_ext.test → ...on_udf/t/encryption_udf_rsa_4096_ext.test b/.../percona_encryption_udf_rsa_4096_ext.test → ...on_udf/t/encryption_udf_rsa_4096_ext.test
@@ -6,4 +6,4 @@
 --let $key_length = 4096
 --let $use_openssl_binary = 1
 
---source include/percona_encryption_udf_xsa.inc
+--source ../include/encryption_udf_xsa.inc
diff --git a/...cona_encryption_udf_xsa_sanity-master.opt → ...df/t/encryption_udf_xsa_sanity-master.opt b/...cona_encryption_udf_xsa_sanity-master.opt → ...df/t/encryption_udf_xsa_sanity-master.opt
diff --git a/.../t/percona_encryption_udf_xsa_sanity.test → ...tion_udf/t/encryption_udf_xsa_sanity.test b/.../t/percona_encryption_udf_xsa_sanity.test → ...tion_udf/t/encryption_udf_xsa_sanity.test
diff --git a/mysql-test/suite/innodb/include/percona_get_last_bmp_file_name_size.inc b/mysql-test/suite/innodb/include/percona_get_last_bmp_file_name_size.inc
diff --git a/mysql-test/suite/innodb/include/xtradb_compressed_columns_virtual_superset.inc b/mysql-test/suite/innodb/include/xtradb_compressed_columns_virtual_superset.inc
diff --git a/mysql-test/suite/innodb/t/percona_kill_idle_trx_innodb.test b/mysql-test/suite/innodb/t/percona_kill_idle_trx_innodb.test
diff --git a/mysql-test/suite/innodb/t/xtradb_compressed_columns_ibd_sizes.test b/mysql-test/suite/innodb/t/xtradb_compressed_columns_ibd_sizes.test
diff --git a/mysql-test/suite/innodb/t/xtradb_compressed_columns_ibd_sizes_partitioning.test b/mysql-test/suite/innodb/t/xtradb_compressed_columns_ibd_sizes_partitioning.test
diff --git a/mysql-test/t/mysqldump_gtid_purged.inc → ...percona/include/mysqldump_gtid_purged.inc b/mysql-test/t/mysqldump_gtid_purged.inc → ...percona/include/mysqldump_gtid_purged.inc
diff --git a/...na_enforce_storage_engine_alter_table.inc → ...na_enforce_storage_engine_alter_table.inc b/...na_enforce_storage_engine_alter_table.inc → ...na_enforce_storage_engine_alter_table.inc
@@ -6,23 +6,23 @@ eval OPTIMIZE TABLE $enforce_table;
 # Make sure table engine and column definition hasn't been changed
 --let $enforce_engine= InnoDB
 --let $enforce_column= varchar(1)
---source include/percona_enforce_storage_engine_alter_table_assert.inc
+--source ../include/percona_enforce_storage_engine_alter_table_assert.inc
 
 
 # ALTER TABLE with ALGORITHM=INSTANT must not change table engine
 eval ALTER TABLE $enforce_table ADD COLUMN b ENUM('a', 'b'), ALGORITHM=INSTANT;
 
 --echo After ALTER TABLE with ALGORITHM=INSTANT
 # Make sure table engine and column definition hasn't been changed
---source include/percona_enforce_storage_engine_alter_table_assert.inc
+--source ../include/percona_enforce_storage_engine_alter_table_assert.inc
 
 
 # ALTER TABLE with ALGORITHM=INPLACE must not change table engine
 eval ALTER TABLE $enforce_table DROP COLUMN b, ALGORITHM=INPLACE;
 
 --echo After ALTER TABLE with ALGORITHM=INPLACE
 # Make sure table engine and column definition hasn't been changed
---source include/percona_enforce_storage_engine_alter_table_assert.inc
+--source ../include/percona_enforce_storage_engine_alter_table_assert.inc
 
 
 # ALTER TABLE with ALGORITHM=COPY must not change table engine
@@ -32,4 +32,4 @@ eval ALTER TABLE $enforce_table MODIFY a INT, ALGORITHM=COPY;
 # Make sure table engine hasn't been changed
 # Make sure column definition has been changed
 --let $enforce_column= int
---source include/percona_enforce_storage_engine_alter_table_assert.inc
+--source ../include/percona_enforce_storage_engine_alter_table_assert.inc
diff --git a/...rce_storage_engine_alter_table_assert.inc → ...rce_storage_engine_alter_table_assert.inc b/...rce_storage_engine_alter_table_assert.inc → ...rce_storage_engine_alter_table_assert.inc
diff --git a/...lude/percona_kill_idle_trx_non_trx_se.inc → ...lude/percona_kill_idle_trx_non_trx_se.inc b/...lude/percona_kill_idle_trx_non_trx_se.inc → ...lude/percona_kill_idle_trx_non_trx_se.inc
diff --git a/...de/percona_processlist_row_stats_show.inc → ...de/percona_processlist_row_stats_show.inc b/...de/percona_processlist_row_stats_show.inc → ...de/percona_processlist_row_stats_show.inc
diff --git a/...l-test/include/percona_sequence_table.inc → ...ercona/include/percona_sequence_table.inc b/...l-test/include/percona_sequence_table.inc → ...ercona/include/percona_sequence_table.inc
diff --git a/...-test/include/percona_signal_handling.inc → ...rcona/include/percona_signal_handling.inc b/...-test/include/percona_signal_handling.inc → ...rcona/include/percona_signal_handling.inc
diff --git a/...t/include/percona_slow_query_log_rate.inc → ...a/include/percona_slow_query_log_rate.inc b/...t/include/percona_slow_query_log_rate.inc → ...a/include/percona_slow_query_log_rate.inc
diff --git a/...lity_user_validate_dynamic_privileges.inc → ...lity_user_validate_dynamic_privileges.inc b/...lity_user_validate_dynamic_privileges.inc → ...lity_user_validate_dynamic_privileges.inc
diff --git a/mysql-test/r/aborted_clients.result → ...st/suite/percona/r/aborted_clients.result b/mysql-test/r/aborted_clients.result → ...st/suite/percona/r/aborted_clients.result
diff --git a/mysql-test/r/acl_mdl_scalability.result → ...uite/percona/r/acl_mdl_scalability.result b/mysql-test/r/acl_mdl_scalability.result → ...uite/percona/r/acl_mdl_scalability.result
diff --git a/mysql-test/r/backup_locks.result → ...-test/suite/percona/r/backup_locks.result b/mysql-test/r/backup_locks.result → ...-test/suite/percona/r/backup_locks.result
diff --git a/...l-test/r/backup_locks_binlog_mixed.result → ...ercona/r/backup_locks_binlog_mixed.result b/...l-test/r/backup_locks_binlog_mixed.result → ...ercona/r/backup_locks_binlog_mixed.result
diff --git a/mysql-test/r/backup_locks_binlog_row.result → .../percona/r/backup_locks_binlog_row.result b/mysql-test/r/backup_locks_binlog_row.result → .../percona/r/backup_locks_binlog_row.result
diff --git a/mysql-test/r/backup_locks_binlog_stmt.result → ...percona/r/backup_locks_binlog_stmt.result b/mysql-test/r/backup_locks_binlog_stmt.result → ...percona/r/backup_locks_binlog_stmt.result
diff --git a/mysql-test/r/backup_locks_mysqldump.result → ...e/percona/r/backup_locks_mysqldump.result b/mysql-test/r/backup_locks_mysqldump.result → ...e/percona/r/backup_locks_mysqldump.result
diff --git a/mysql-test/r/backup_safe_binlog_info.result → .../percona/r/backup_safe_binlog_info.result b/mysql-test/r/backup_safe_binlog_info.result → .../percona/r/backup_safe_binlog_info.result
diff --git a/mysql-test/r/percona_binlog_utils_udf.result → ...t/suite/percona/r/binlog_utils_udf.result b/mysql-test/r/percona_binlog_utils_udf.result → ...t/suite/percona/r/binlog_utils_udf.result
diff --git a/mysql-test/r/buffered_error_log.result → ...suite/percona/r/buffered_error_log.result b/mysql-test/r/buffered_error_log.result → ...suite/percona/r/buffered_error_log.result
diff --git a/mysql-test/r/bug100352.result → mysql-test/suite/percona/r/bug100352.result b/mysql-test/r/bug100352.result → mysql-test/suite/percona/r/bug100352.result
diff --git a/mysql-test/r/percona_bug1008609.result → mysql-test/suite/percona/r/bug1008609.result b/mysql-test/r/percona_bug1008609.result → mysql-test/suite/percona/r/bug1008609.result
diff --git a/mysql-test/r/percona_bug1011047.result → mysql-test/suite/percona/r/bug1011047.result b/mysql-test/r/percona_bug1011047.result → mysql-test/suite/percona/r/bug1011047.result
diff --git a/mysql-test/r/percona_bug1016991.result → mysql-test/suite/percona/r/bug1016991.result b/mysql-test/r/percona_bug1016991.result → mysql-test/suite/percona/r/bug1016991.result
diff --git a/mysql-test/r/percona_bug1035225.result → mysql-test/suite/percona/r/bug1035225.result b/mysql-test/r/percona_bug1035225.result → mysql-test/suite/percona/r/bug1035225.result
diff --git a/mysql-test/r/percona_bug1113388.result → mysql-test/suite/percona/r/bug1113388.result b/mysql-test/r/percona_bug1113388.result → mysql-test/suite/percona/r/bug1113388.result
diff --git a/mysql-test/r/percona_bug1193264.result → mysql-test/suite/percona/r/bug1193264.result b/mysql-test/r/percona_bug1193264.result → mysql-test/suite/percona/r/bug1193264.result
diff --git a/mysql-test/r/percona_bug1201681.result → mysql-test/suite/percona/r/bug1201681.result b/mysql-test/r/percona_bug1201681.result → mysql-test/suite/percona/r/bug1201681.result
diff --git a/mysql-test/r/percona_bug1289599.result → mysql-test/suite/percona/r/bug1289599.result b/mysql-test/r/percona_bug1289599.result → mysql-test/suite/percona/r/bug1289599.result
diff --git a/mysql-test/r/percona_bug1294190.result → mysql-test/suite/percona/r/bug1294190.result b/mysql-test/r/percona_bug1294190.result → mysql-test/suite/percona/r/bug1294190.result
diff --git a/mysql-test/r/percona_bug1379582.result → mysql-test/suite/percona/r/bug1379582.result b/mysql-test/r/percona_bug1379582.result → mysql-test/suite/percona/r/bug1379582.result
diff --git a/mysql-test/r/percona_bug1380010.result → mysql-test/suite/percona/r/bug1380010.result b/mysql-test/r/percona_bug1380010.result → mysql-test/suite/percona/r/bug1380010.result
diff --git a/mysql-test/r/percona_bug1393682.result → mysql-test/suite/percona/r/bug1393682.result b/mysql-test/r/percona_bug1393682.result → mysql-test/suite/percona/r/bug1393682.result
diff --git a/mysql-test/r/percona_bug1432494.result → mysql-test/suite/percona/r/bug1432494.result b/mysql-test/r/percona_bug1432494.result → mysql-test/suite/percona/r/bug1432494.result
diff --git a/mysql-test/r/percona_bug1617586.result → mysql-test/suite/percona/r/bug1617586.result b/mysql-test/r/percona_bug1617586.result → mysql-test/suite/percona/r/bug1617586.result
diff --git a/mysql-test/r/bug45702.result → mysql-test/suite/percona/r/bug45702.result b/mysql-test/r/bug45702.result → mysql-test/suite/percona/r/bug45702.result
diff --git a/mysql-test/r/bug49336.result → mysql-test/suite/percona/r/bug49336.result b/mysql-test/r/bug49336.result → mysql-test/suite/percona/r/bug49336.result
diff --git a/mysql-test/r/bug53588.result → mysql-test/suite/percona/r/bug53588.result b/mysql-test/r/bug53588.result → mysql-test/suite/percona/r/bug53588.result
diff --git a/mysql-test/r/bug57430.result → mysql-test/suite/percona/r/bug57430.result b/mysql-test/r/bug57430.result → mysql-test/suite/percona/r/bug57430.result
diff --git a/mysql-test/r/bug63144.result → mysql-test/suite/percona/r/bug63144.result b/mysql-test/r/bug63144.result → mysql-test/suite/percona/r/bug63144.result
diff --git a/mysql-test/r/percona_bug643149.result → mysql-test/suite/percona/r/bug643149.result b/mysql-test/r/percona_bug643149.result → mysql-test/suite/percona/r/bug643149.result
diff --git a/mysql-test/r/bug67974.result → mysql-test/suite/percona/r/bug67974.result b/mysql-test/r/bug67974.result → mysql-test/suite/percona/r/bug67974.result
diff --git a/mysql-test/r/bug71315.result → mysql-test/suite/percona/r/bug71315.result b/mysql-test/r/bug71315.result → mysql-test/suite/percona/r/bug71315.result
diff --git a/mysql-test/r/bug71858.result → mysql-test/suite/percona/r/bug71858.result b/mysql-test/r/bug71858.result → mysql-test/suite/percona/r/bug71858.result
diff --git a/mysql-test/r/bug73556.result → mysql-test/suite/percona/r/bug73556.result b/mysql-test/r/bug73556.result → mysql-test/suite/percona/r/bug73556.result
diff --git a/mysql-test/r/bug74008.result → mysql-test/suite/percona/r/bug74008.result b/mysql-test/r/bug74008.result → mysql-test/suite/percona/r/bug74008.result
diff --git a/mysql-test/r/bug74447.result → mysql-test/suite/percona/r/bug74447.result b/mysql-test/r/bug74447.result → mysql-test/suite/percona/r/bug74447.result
diff --git a/mysql-test/r/bug74578.result → mysql-test/suite/percona/r/bug74578.result b/mysql-test/r/bug74578.result → mysql-test/suite/percona/r/bug74578.result
diff --git a/mysql-test/r/bug74579.result → mysql-test/suite/percona/r/bug74579.result b/mysql-test/r/bug74579.result → mysql-test/suite/percona/r/bug74579.result
diff --git a/mysql-test/r/bug74583.result → mysql-test/suite/percona/r/bug74583.result b/mysql-test/r/bug74583.result → mysql-test/suite/percona/r/bug74583.result
diff --git a/mysql-test/r/bug74615.result → mysql-test/suite/percona/r/bug74615.result b/mysql-test/r/bug74615.result → mysql-test/suite/percona/r/bug74615.result
diff --git a/mysql-test/r/bug74619.result → mysql-test/suite/percona/r/bug74619.result b/mysql-test/r/bug74619.result → mysql-test/suite/percona/r/bug74619.result
diff --git a/mysql-test/r/bug74628.result → mysql-test/suite/percona/r/bug74628.result b/mysql-test/r/bug74628.result → mysql-test/suite/percona/r/bug74628.result
diff --git a/mysql-test/r/bug74644.result → mysql-test/suite/percona/r/bug74644.result b/mysql-test/r/bug74644.result → mysql-test/suite/percona/r/bug74644.result
diff --git a/mysql-test/r/bug74670.result → mysql-test/suite/percona/r/bug74670.result b/mysql-test/r/bug74670.result → mysql-test/suite/percona/r/bug74670.result
diff --git a/mysql-test/r/bug74671.result → mysql-test/suite/percona/r/bug74671.result b/mysql-test/r/bug74671.result → mysql-test/suite/percona/r/bug74671.result
diff --git a/mysql-test/r/bug74778.result → mysql-test/suite/percona/r/bug74778.result b/mysql-test/r/bug74778.result → mysql-test/suite/percona/r/bug74778.result
diff --git a/mysql-test/r/bug74783.result → mysql-test/suite/percona/r/bug74783.result b/mysql-test/r/bug74783.result → mysql-test/suite/percona/r/bug74783.result
diff --git a/mysql-test/r/bug74807.result → mysql-test/suite/percona/r/bug74807.result b/mysql-test/r/bug74807.result → mysql-test/suite/percona/r/bug74807.result
diff --git a/mysql-test/r/bug74850.result → mysql-test/suite/percona/r/bug74850.result b/mysql-test/r/bug74850.result → mysql-test/suite/percona/r/bug74850.result
diff --git a/mysql-test/r/bug74898.result → mysql-test/suite/percona/r/bug74898.result b/mysql-test/r/bug74898.result → mysql-test/suite/percona/r/bug74898.result
diff --git a/mysql-test/r/bug74950.result → mysql-test/suite/percona/r/bug74950.result b/mysql-test/r/bug74950.result → mysql-test/suite/percona/r/bug74950.result
diff --git a/mysql-test/r/bug74953.result → mysql-test/suite/percona/r/bug74953.result b/mysql-test/r/bug74953.result → mysql-test/suite/percona/r/bug74953.result
diff --git a/mysql-test/r/bug75701.result → mysql-test/suite/percona/r/bug75701.result b/mysql-test/r/bug75701.result → mysql-test/suite/percona/r/bug75701.result
diff --git a/mysql-test/r/bug75721.result → mysql-test/suite/percona/r/bug75721.result b/mysql-test/r/bug75721.result → mysql-test/suite/percona/r/bug75721.result
diff --git a/mysql-test/r/bug75938.result → mysql-test/suite/percona/r/bug75938.result b/mysql-test/r/bug75938.result → mysql-test/suite/percona/r/bug75938.result
diff --git a/mysql-test/r/bug75943.result → mysql-test/suite/percona/r/bug75943.result b/mysql-test/r/bug75943.result → mysql-test/suite/percona/r/bug75943.result
diff --git a/mysql-test/r/bug76039.result → mysql-test/suite/percona/r/bug76039.result b/mysql-test/r/bug76039.result → mysql-test/suite/percona/r/bug76039.result
diff --git a/mysql-test/r/bug76277.result → mysql-test/suite/percona/r/bug76277.result b/mysql-test/r/bug76277.result → mysql-test/suite/percona/r/bug76277.result
diff --git a/mysql-test/r/bug76946.result → mysql-test/suite/percona/r/bug76946.result b/mysql-test/r/bug76946.result → mysql-test/suite/percona/r/bug76946.result
diff --git a/mysql-test/r/bug77522.result → mysql-test/suite/percona/r/bug77522.result b/mysql-test/r/bug77522.result → mysql-test/suite/percona/r/bug77522.result
diff --git a/mysql-test/r/bug77591.result → mysql-test/suite/percona/r/bug77591.result b/mysql-test/r/bug77591.result → mysql-test/suite/percona/r/bug77591.result
diff --git a/mysql-test/r/bug78064.result → mysql-test/suite/percona/r/bug78064.result b/mysql-test/r/bug78064.result → mysql-test/suite/percona/r/bug78064.result
diff --git a/mysql-test/r/bug78230.result → mysql-test/suite/percona/r/bug78230.result b/mysql-test/r/bug78230.result → mysql-test/suite/percona/r/bug78230.result
diff --git a/mysql-test/r/bug80134.result → mysql-test/suite/percona/r/bug80134.result b/mysql-test/r/bug80134.result → mysql-test/suite/percona/r/bug80134.result
diff --git a/mysql-test/r/bug80152.result → mysql-test/suite/percona/r/bug80152.result b/mysql-test/r/bug80152.result → mysql-test/suite/percona/r/bug80152.result
diff --git a/mysql-test/r/bug80438.result → mysql-test/suite/percona/r/bug80438.result b/mysql-test/r/bug80438.result → mysql-test/suite/percona/r/bug80438.result
diff --git a/mysql-test/r/bug81409.result → mysql-test/suite/percona/r/bug81409.result b/mysql-test/r/bug81409.result → mysql-test/suite/percona/r/bug81409.result
diff --git a/mysql-test/r/bug81447.result → mysql-test/suite/percona/r/bug81447.result b/mysql-test/r/bug81447.result → mysql-test/suite/percona/r/bug81447.result
diff --git a/mysql-test/r/bug81449.result → mysql-test/suite/percona/r/bug81449.result b/mysql-test/r/bug81449.result → mysql-test/suite/percona/r/bug81449.result
diff --git a/mysql-test/r/bug81457.result → mysql-test/suite/percona/r/bug81457.result b/mysql-test/r/bug81457.result → mysql-test/suite/percona/r/bug81457.result
diff --git a/mysql-test/r/bug81472.result → mysql-test/suite/percona/r/bug81472.result b/mysql-test/r/bug81472.result → mysql-test/suite/percona/r/bug81472.result
diff --git a/mysql-test/r/bug82026.result → mysql-test/suite/percona/r/bug82026.result b/mysql-test/r/bug82026.result → mysql-test/suite/percona/r/bug82026.result
diff --git a/mysql-test/r/bug82652.result → mysql-test/suite/percona/r/bug82652.result b/mysql-test/r/bug82652.result → mysql-test/suite/percona/r/bug82652.result
diff --git a/mysql-test/r/bug82967.result → mysql-test/suite/percona/r/bug82967.result b/mysql-test/r/bug82967.result → mysql-test/suite/percona/r/bug82967.result
diff --git a/mysql-test/r/bug83739.result → mysql-test/suite/percona/r/bug83739.result b/mysql-test/r/bug83739.result → mysql-test/suite/percona/r/bug83739.result
diff --git a/mysql-test/r/bug84512.result → mysql-test/suite/percona/r/bug84512.result b/mysql-test/r/bug84512.result → mysql-test/suite/percona/r/bug84512.result
diff --git a/mysql-test/r/bug84640.result → mysql-test/suite/percona/r/bug84640.result b/mysql-test/r/bug84640.result → mysql-test/suite/percona/r/bug84640.result
diff --git a/mysql-test/r/bug84656.result → mysql-test/suite/percona/r/bug84656.result b/mysql-test/r/bug84656.result → mysql-test/suite/percona/r/bug84656.result
diff --git a/mysql-test/r/bug84736.result → mysql-test/suite/percona/r/bug84736.result b/mysql-test/r/bug84736.result → mysql-test/suite/percona/r/bug84736.result
diff --git a/mysql-test/r/bug84824.result → mysql-test/suite/percona/r/bug84824.result b/mysql-test/r/bug84824.result → mysql-test/suite/percona/r/bug84824.result
diff --git a/mysql-test/r/bug86799.result → mysql-test/suite/percona/r/bug86799.result b/mysql-test/r/bug86799.result → mysql-test/suite/percona/r/bug86799.result
diff --git a/mysql-test/r/bug88323.result → mysql-test/suite/percona/r/bug88323.result b/mysql-test/r/bug88323.result → mysql-test/suite/percona/r/bug88323.result
diff --git a/mysql-test/r/bug88781.result → mysql-test/suite/percona/r/bug88781.result b/mysql-test/r/bug88781.result → mysql-test/suite/percona/r/bug88781.result
diff --git a/mysql-test/r/bug88797.result → mysql-test/suite/percona/r/bug88797.result b/mysql-test/r/bug88797.result → mysql-test/suite/percona/r/bug88797.result
diff --git a/mysql-test/r/bug88800.result → mysql-test/suite/percona/r/bug88800.result b/mysql-test/r/bug88800.result → mysql-test/suite/percona/r/bug88800.result
diff --git a/mysql-test/r/bug90351.result → mysql-test/suite/percona/r/bug90351.result b/mysql-test/r/bug90351.result → mysql-test/suite/percona/r/bug90351.result
diff --git a/mysql-test/r/bug90518.result → mysql-test/suite/percona/r/bug90518.result b/mysql-test/r/bug90518.result → mysql-test/suite/percona/r/bug90518.result
diff --git a/mysql-test/r/bug90552.result → mysql-test/suite/percona/r/bug90552.result b/mysql-test/r/bug90552.result → mysql-test/suite/percona/r/bug90552.result
diff --git a/mysql-test/r/bug90673.result → mysql-test/suite/percona/r/bug90673.result b/mysql-test/r/bug90673.result → mysql-test/suite/percona/r/bug90673.result
diff --git a/mysql-test/r/bug93388.result → mysql-test/suite/percona/r/bug93388.result b/mysql-test/r/bug93388.result → mysql-test/suite/percona/r/bug93388.result
diff --git a/mysql-test/r/bug94176.result → mysql-test/suite/percona/r/bug94176.result b/mysql-test/r/bug94176.result → mysql-test/suite/percona/r/bug94176.result
diff --git a/mysql-test/r/bug95108.result → mysql-test/suite/percona/r/bug95108.result b/mysql-test/r/bug95108.result → mysql-test/suite/percona/r/bug95108.result
diff --git a/mysql-test/r/bug95923.result → mysql-test/suite/percona/r/bug95923.result b/mysql-test/r/bug95923.result → mysql-test/suite/percona/r/bug95923.result
diff --git a/mysql-test/r/percona_bug_ps1095.result → mysql-test/suite/percona/r/bug_ps1095.result b/mysql-test/r/percona_bug_ps1095.result → mysql-test/suite/percona/r/bug_ps1095.result
diff --git a/mysql-test/r/bug_ps7923.result → mysql-test/suite/percona/r/bug_ps7923.result b/mysql-test/r/bug_ps7923.result → mysql-test/suite/percona/r/bug_ps7923.result
diff --git a/mysql-test/r/percona_bug_ps8647.result → mysql-test/suite/percona/r/bug_ps8647.result b/mysql-test/r/percona_bug_ps8647.result → mysql-test/suite/percona/r/bug_ps8647.result
diff --git a/mysql-test/r/change_user_notembedded.result → .../percona/r/change_user_notembedded.result b/mysql-test/r/change_user_notembedded.result → .../percona/r/change_user_notembedded.result
diff --git a/...l-test/r/clone_consistent_snapshot.result → ...ercona/r/clone_consistent_snapshot.result b/...l-test/r/clone_consistent_snapshot.result → ...ercona/r/clone_consistent_snapshot.result
diff --git a/mysql-test/r/coredump.result → mysql-test/suite/percona/r/coredump.result b/mysql-test/r/coredump.result → mysql-test/suite/percona/r/coredump.result
diff --git a/mysql-test/r/ctype_uca_innodb.result → ...t/suite/percona/r/ctype_uca_innodb.result b/mysql-test/r/ctype_uca_innodb.result → ...t/suite/percona/r/ctype_uca_innodb.result
diff --git a/.../percona_dd_upgrade_57_many_tables.result → ...ercona/r/dd_upgrade_57_many_tables.result b/.../percona_dd_upgrade_57_many_tables.result → ...ercona/r/dd_upgrade_57_many_tables.result
diff --git a/...ercona_dd_upgrade_compression_dict.result → ...cona/r/dd_upgrade_compression_dict.result b/...ercona_dd_upgrade_compression_dict.result → ...cona/r/dd_upgrade_compression_dict.result
diff --git a/...ona_dd_upgrade_compression_dict_80.result → ...a/r/dd_upgrade_compression_dict_80.result b/...ona_dd_upgrade_compression_dict_80.result → ...a/r/dd_upgrade_compression_dict_80.result
diff --git a/..._dd_upgrade_compression_dict_debug.result → .../dd_upgrade_compression_dict_debug.result b/..._dd_upgrade_compression_dict_debug.result → .../dd_upgrade_compression_dict_debug.result
diff --git a/...est/r/percona_dd_upgrade_encrypted.result → ...ite/percona/r/dd_upgrade_encrypted.result b/...est/r/percona_dd_upgrade_encrypted.result → ...ite/percona/r/dd_upgrade_encrypted.result
diff --git a/...cona_dd_upgrade_file_per_table_off.result → ...na/r/dd_upgrade_file_per_table_off.result b/...cona_dd_upgrade_file_per_table_off.result → ...na/r/dd_upgrade_file_per_table_off.result
diff --git a/.../percona_dd_upgrade_undo_encrypted.result → ...ercona/r/dd_upgrade_undo_encrypted.result b/.../percona_dd_upgrade_undo_encrypted.result → ...ercona/r/dd_upgrade_undo_encrypted.result
diff --git a/...l-test/r/percona_encrypt_tmp_files.result → .../suite/percona/r/encrypt_tmp_files.result b/...l-test/r/percona_encrypt_tmp_files.result → .../suite/percona/r/encrypt_tmp_files.result
diff --git a/.../r/percona_encrypt_tmp_files_debug.result → .../percona/r/encrypt_tmp_files_debug.result b/.../r/percona_encrypt_tmp_files_debug.result → .../percona/r/encrypt_tmp_files_debug.result
diff --git a/...rcona_enforce_se_create_table_like.result → ...ona/r/enforce_se_create_table_like.result b/...rcona_enforce_se_create_table_like.result → ...ona/r/enforce_se_create_table_like.result
diff --git a/...t/r/percona_enforce_storage_engine.result → ...e/percona/r/enforce_storage_engine.result b/...t/r/percona_enforce_storage_engine.result → ...e/percona/r/enforce_storage_engine.result
diff --git a/...enforce_storage_engine_alter_table.result → ...enforce_storage_engine_alter_table.result b/...enforce_storage_engine_alter_table.result → ...enforce_storage_engine_alter_table.result
diff --git a/...na_enforce_storage_engine_disabled.result → .../r/enforce_storage_engine_disabled.result b/...na_enforce_storage_engine_disabled.result → .../r/enforce_storage_engine_disabled.result
diff --git a/...percona_expand_fast_index_creation.result → ...rcona/r/expand_fast_index_creation.result b/...percona_expand_fast_index_creation.result → ...rcona/r/expand_fast_index_creation.result
diff --git a/mysql-test/r/failed_auth_3909.result → ...t/suite/percona/r/failed_auth_3909.result b/mysql-test/r/failed_auth_3909.result → ...t/suite/percona/r/failed_auth_3909.result
diff --git a/mysql-test/r/flush_memory_profile.result → ...ite/percona/r/flush_memory_profile.result b/mysql-test/r/flush_memory_profile.result → ...ite/percona/r/flush_memory_profile.result
diff --git a/.../percona_ft_query_extra_word_chars.result → ...ercona/r/ft_query_extra_word_chars.result b/.../percona_ft_query_extra_word_chars.result → ...ercona/r/ft_query_extra_word_chars.result
diff --git a/mysql-test/r/gap_lock_error_memory.result → ...te/percona/r/gap_lock_error_memory.result b/mysql-test/r/gap_lock_error_memory.result → ...te/percona/r/gap_lock_error_memory.result
diff --git a/mysql-test/r/gap_lock_error_myisam.result → ...te/percona/r/gap_lock_error_myisam.result b/mysql-test/r/gap_lock_error_myisam.result → ...te/percona/r/gap_lock_error_myisam.result
diff --git a/mysql-test/r/group_commit_crash.result → ...suite/percona/r/group_commit_crash.result b/mysql-test/r/group_commit_crash.result → ...suite/percona/r/group_commit_crash.result
diff --git a/mysql-test/r/percona_heap_blob.result → mysql-test/suite/percona/r/heap_blob.result b/mysql-test/r/percona_heap_blob.result → mysql-test/suite/percona/r/heap_blob.result
diff --git a/mysql-test/r/percona_heap_bug783366.result → ...est/suite/percona/r/heap_bug783366.result b/mysql-test/r/percona_heap_bug783366.result → ...est/suite/percona/r/heap_bug783366.result
diff --git a/mysql-test/r/percona_heap_bug783451.result → ...est/suite/percona/r/heap_bug783451.result b/mysql-test/r/percona_heap_bug783451.result → ...est/suite/percona/r/heap_bug783451.result
diff --git a/mysql-test/r/percona_heap_bug784464.result → ...est/suite/percona/r/heap_bug784464.result b/mysql-test/r/percona_heap_bug784464.result → ...est/suite/percona/r/heap_bug784464.result
diff --git a/...est/r/percona_heap_bug784464_32bit.result → ...ite/percona/r/heap_bug784464_32bit.result b/...est/r/percona_heap_bug784464_32bit.result → ...ite/percona/r/heap_bug784464_32bit.result
diff --git a/...est/r/percona_heap_bug784464_64bit.result → ...ite/percona/r/heap_bug784464_64bit.result b/...est/r/percona_heap_bug784464_64bit.result → ...ite/percona/r/heap_bug784464_64bit.result
diff --git a/mysql-test/r/percona_heap_bug784468.result → ...est/suite/percona/r/heap_bug784468.result b/mysql-test/r/percona_heap_bug784468.result → ...est/suite/percona/r/heap_bug784468.result
diff --git a/mysql-test/r/percona_heap_bug788544.result → ...est/suite/percona/r/heap_bug788544.result b/mysql-test/r/percona_heap_bug788544.result → ...est/suite/percona/r/heap_bug788544.result
diff --git a/mysql-test/r/percona_heap_bug788576.result → ...est/suite/percona/r/heap_bug788576.result b/mysql-test/r/percona_heap_bug788576.result → ...est/suite/percona/r/heap_bug788576.result
diff --git a/mysql-test/r/percona_heap_bug788722.result → ...est/suite/percona/r/heap_bug788722.result b/mysql-test/r/percona_heap_bug788722.result → ...est/suite/percona/r/heap_bug788722.result
diff --git a/mysql-test/r/percona_heap_bug789131.result → ...est/suite/percona/r/heap_bug789131.result b/mysql-test/r/percona_heap_bug789131.result → ...est/suite/percona/r/heap_bug789131.result
diff --git a/mysql-test/r/percona_heap_bug_ps1469.result → ...st/suite/percona/r/heap_bug_ps1469.result b/mysql-test/r/percona_heap_bug_ps1469.result → ...st/suite/percona/r/heap_bug_ps1469.result
diff --git a/mysql-test/r/percona_heap_bug_ps296.result → ...est/suite/percona/r/heap_bug_ps296.result b/mysql-test/r/percona_heap_bug_ps296.result → ...est/suite/percona/r/heap_bug_ps296.result
diff --git a/mysql-test/r/percona_heap_json.result → mysql-test/suite/percona/r/heap_json.result b/mysql-test/r/percona_heap_json.result → mysql-test/suite/percona/r/heap_json.result
diff --git a/mysql-test/r/percona_heap_var.result → mysql-test/suite/percona/r/heap_var.result b/mysql-test/r/percona_heap_var.result → mysql-test/suite/percona/r/heap_var.result
diff --git a/mysql-test/r/percona_innodb_version.result → ...est/suite/percona/r/innodb_version.result b/mysql-test/r/percona_innodb_version.result → ...est/suite/percona/r/innodb_version.result
diff --git a/mysql-test/r/percona_kill_idle_trx.result → ...test/suite/percona/r/kill_idle_trx.result b/mysql-test/r/percona_kill_idle_trx.result → ...test/suite/percona/r/kill_idle_trx.result
diff --git a/...r/percona_kill_idle_trx_threadpool.result → ...percona/r/kill_idle_trx_threadpool.result b/...r/percona_kill_idle_trx_threadpool.result → ...percona/r/kill_idle_trx_threadpool.result
diff --git a/...est/r/percona_log_connection_error.result → ...ite/percona/r/log_connection_error.result b/...est/r/percona_log_connection_error.result → ...ite/percona/r/log_connection_error.result
diff --git a/...t/r/percona_log_creation_timestamp.result → ...e/percona/r/log_creation_timestamp.result b/...t/r/percona_log_creation_timestamp.result → ...e/percona/r/log_creation_timestamp.result
diff --git a/...a_log_slow_admin_statements-config.result → ...r/log_slow_admin_statements-config.result b/...a_log_slow_admin_statements-config.result → ...r/log_slow_admin_statements-config.result
diff --git a/...slow_admin_statements-config_false.result → ...slow_admin_statements-config_false.result b/...slow_admin_statements-config_false.result → ...slow_admin_statements-config_false.result
diff --git a/...g_slow_admin_statements-config_foo.result → ...g_slow_admin_statements-config_foo.result b/...g_slow_admin_statements-config_foo.result → ...g_slow_admin_statements-config_foo.result
diff --git a/..._slow_admin_statements-config_true.result → ..._slow_admin_statements-config_true.result b/..._slow_admin_statements-config_true.result → ..._slow_admin_statements-config_true.result
diff --git a/.../percona_log_slow_admin_statements.result → ...ercona/r/log_slow_admin_statements.result b/.../percona_log_slow_admin_statements.result → ...ercona/r/log_slow_admin_statements.result
diff --git a/...rcona_log_slow_admin_statements_sp.result → ...ona/r/log_slow_admin_statements_sp.result b/...rcona_log_slow_admin_statements_sp.result → ...ona/r/log_slow_admin_statements_sp.result
diff --git a/...-test/r/percona_log_slow_filter-cl.result → ...suite/percona/r/log_slow_filter-cl.result b/...-test/r/percona_log_slow_filter-cl.result → ...suite/percona/r/log_slow_filter-cl.result
diff --git a/...st/r/percona_log_slow_query_errors.result → ...te/percona/r/log_slow_query_errors.result b/...st/r/percona_log_slow_query_errors.result → ...te/percona/r/log_slow_query_errors.result
diff --git a/...test/r/percona_log_slow_query_plan.result → ...uite/percona/r/log_slow_query_plan.result b/...test/r/percona_log_slow_query_plan.result → ...uite/percona/r/log_slow_query_plan.result
diff --git a/...rcona_log_slow_slave_statements-cl.result → ...ona/r/log_slow_slave_statements-cl.result b/...rcona_log_slow_slave_statements-cl.result → ...ona/r/log_slow_slave_statements-cl.result
diff --git a/.../percona_log_slow_sp_statements-cl.result → ...ercona/r/log_slow_sp_statements-cl.result b/.../percona_log_slow_sp_statements-cl.result → ...ercona/r/log_slow_sp_statements-cl.result
diff --git a/...t/r/percona_log_slow_sp_statements.result → ...e/percona/r/log_slow_sp_statements.result b/...t/r/percona_log_slow_sp_statements.result → ...e/percona/r/log_slow_sp_statements.result
diff --git a/...st/r/percona_log_slow_verbosity-cl.result → ...te/percona/r/log_slow_verbosity-cl.result b/...st/r/percona_log_slow_verbosity-cl.result → ...te/percona/r/log_slow_verbosity-cl.result
diff --git a/...-test/r/percona_log_slow_verbosity.result → ...suite/percona/r/log_slow_verbosity.result b/...-test/r/percona_log_slow_verbosity.result → ...suite/percona/r/log_slow_verbosity.result
diff --git a/mysql-test/r/percona_long_query_time.result → ...st/suite/percona/r/long_query_time.result b/mysql-test/r/percona_long_query_time.result → ...st/suite/percona/r/long_query_time.result
diff --git a/...t/r/percona_min_examined_row_limit.result → ...e/percona/r/min_examined_row_limit.result b/...t/r/percona_min_examined_row_limit.result → ...e/percona/r/min_examined_row_limit.result
diff --git a/...test/r/mysql_upgrade_fails_toku_57.result → ...cona/r/mysql_upgrade_fails_toku_57.result b/...test/r/mysql_upgrade_fails_toku_57.result → ...cona/r/mysql_upgrade_fails_toku_57.result
diff --git a/...test/r/mysql_upgrade_fails_toku_80.result → ...cona/r/mysql_upgrade_fails_toku_80.result b/...test/r/mysql_upgrade_fails_toku_80.result → ...cona/r/mysql_upgrade_fails_toku_80.result
diff --git a/...r/percona_mysqlbinlog_ssl_compress.result → ...percona/r/mysqlbinlog_ssl_compress.result b/...r/percona_mysqlbinlog_ssl_compress.result → ...percona/r/mysqlbinlog_ssl_compress.result
diff --git a/mysql-test/r/mysqldump_gtid_purged.result → ...te/percona/r/mysqldump_gtid_purged.result b/mysql-test/r/mysqldump_gtid_purged.result → ...te/percona/r/mysqldump_gtid_purged.result
diff --git a/...ona_mysqldump_innodb_optimize_keys.result → ...a/r/mysqldump_innodb_optimize_keys.result b/...ona_mysqldump_innodb_optimize_keys.result → ...a/r/mysqldump_innodb_optimize_keys.result
diff --git a/...-test/r/net_buffer_shrink_interval.result → ...rcona/r/net_buffer_shrink_interval.result b/...-test/r/net_buffer_shrink_interval.result → ...rcona/r/net_buffer_shrink_interval.result
diff --git a/.../percona_nonflushing_analyze_debug.result → ...ercona/r/nonflushing_analyze_debug.result b/.../percona_nonflushing_analyze_debug.result → ...ercona/r/nonflushing_analyze_debug.result
diff --git a/...-test/r/percona_outfile_fifosocket.result → ...suite/percona/r/outfile_fifosocket.result b/...-test/r/percona_outfile_fifosocket.result → ...suite/percona/r/outfile_fifosocket.result
diff --git a/...est/r/parser_local_transformations.result → ...ona/r/parser_local_transformations.result b/...est/r/parser_local_transformations.result → ...ona/r/parser_local_transformations.result
diff --git a/mysql-test/r/pool_of_threads.result → ...st/suite/percona/r/pool_of_threads.result b/mysql-test/r/pool_of_threads.result → ...st/suite/percona/r/pool_of_threads.result
diff --git a/.../pool_of_threads_high_prio_tickets.result → .../pool_of_threads_high_prio_tickets.result b/.../pool_of_threads_high_prio_tickets.result → .../pool_of_threads_high_prio_tickets.result
diff --git a/...st/r/percona_processlist_row_stats.result → ...te/percona/r/processlist_row_stats.result b/...st/r/percona_processlist_row_stats.result → ...te/percona/r/processlist_row_stats.result
diff --git a/mysql-test/r/percona_processlist_tid.result → ...st/suite/percona/r/processlist_tid.result b/mysql-test/r/percona_processlist_tid.result → ...st/suite/percona/r/processlist_tid.result
diff --git a/mysql-test/r/proxy_protocol.result → ...est/suite/percona/r/proxy_protocol.result b/mysql-test/r/proxy_protocol.result → ...est/suite/percona/r/proxy_protocol.result
diff --git a/...l-test/r/proxy_protocol_admin_port.result → ...ercona/r/proxy_protocol_admin_port.result b/...l-test/r/proxy_protocol_admin_port.result → ...ercona/r/proxy_protocol_admin_port.result
diff --git a/...t/r/ps8128_upgrade_perfschema_view.result → ...a/r/ps8128_upgrade_perfschema_view.result b/...t/r/ps8128_upgrade_perfschema_view.result → ...a/r/ps8128_upgrade_perfschema_view.result
diff --git a/...ps_trigger_access_check_regression.result → ...ps_trigger_access_check_regression.result b/...ps_trigger_access_check_regression.result → ...ps_trigger_access_check_regression.result
diff --git a/.../percona_secure_file_priv_insecure.result → ...ercona/r/secure_file_priv_insecure.result b/.../percona_secure_file_priv_insecure.result → ...ercona/r/secure_file_priv_insecure.result
diff --git a/...t/r/percona_secure_file_priv_noarg.result → ...e/percona/r/secure_file_priv_noarg.result b/...t/r/percona_secure_file_priv_noarg.result → ...e/percona/r/secure_file_priv_noarg.result
diff --git a/mysql-test/r/secure_log_path.result → ...st/suite/percona/r/secure_log_path.result b/mysql-test/r/secure_log_path.result → ...st/suite/percona/r/secure_log_path.result
diff --git a/mysql-test/r/percona_sequence_table.result → ...est/suite/percona/r/sequence_table.result b/mysql-test/r/percona_sequence_table.result → ...est/suite/percona/r/sequence_table.result
diff --git a/...l-test/r/percona_set_var_extension.result → .../suite/percona/r/set_var_extension.result b/...l-test/r/percona_set_var_extension.result → .../suite/percona/r/set_var_extension.result
diff --git a/...st/r/percona_show_effective_grants.result → ...te/percona/r/show_effective_grants.result b/...st/r/percona_show_effective_grants.result → ...te/percona/r/show_effective_grants.result
diff --git a/mysql-test/r/percona_show_temp_tables.result → ...t/suite/percona/r/show_temp_tables.result b/mysql-test/r/percona_show_temp_tables.result → ...t/suite/percona/r/show_temp_tables.result
diff --git a/...t/r/percona_show_temp_tables_debug.result → ...e/percona/r/show_temp_tables_debug.result b/...t/r/percona_show_temp_tables_debug.result → ...e/percona/r/show_temp_tables_debug.result
diff --git a/.../r/percona_show_temp_tables_stress.result → .../percona/r/show_temp_tables_stress.result b/.../r/percona_show_temp_tables_stress.result → .../percona/r/show_temp_tables_stress.result
diff --git a/mysql-test/r/percona_signal_handling.result → ...st/suite/percona/r/signal_handling.result b/mysql-test/r/percona_signal_handling.result → ...st/suite/percona/r/signal_handling.result
diff --git a/...percona_signal_handling_threadpool.result → ...rcona/r/signal_handling_threadpool.result b/...percona_signal_handling_threadpool.result → ...rcona/r/signal_handling_threadpool.result
diff --git a/...ercona_slow_extended_error_on_quit.result → ...cona/r/slow_extended_error_on_quit.result b/...ercona_slow_extended_error_on_quit.result → ...cona/r/slow_extended_error_on_quit.result
diff --git a/.../r/percona_slow_extended_log_error.result → .../percona/r/slow_extended_log_error.result b/.../r/percona_slow_extended_log_error.result → .../percona/r/slow_extended_log_error.result
@@ -28,11 +28,11 @@ accessed. Statement des not fail in case DD table names
 are submitted as strings in WHERE clause.
 
 [log_start.inc] percona.slow_extended.log_error_4
-SELECT SCHEMA_NAME as Test FROM information_schema.schemata WHERE SCHEMA_NAME NOT IN ('mysql', 'performance_schema', 'information_schema');
+SELECT SCHEMA_NAME as Test FROM information_schema.schemata WHERE SCHEMA_NAME NOT IN ('mysql', 'performance_schema', 'information_schema') ORDER BY SCHEMA_NAME;
 Test
+mtr
 sys
 test
-mtr
 [log_stop.inc] percona.slow_extended.log_error_4
 [log_grep.inc] file: percona.slow_extended.log_error_4 pattern: ^.*Last_errno: 0 .*$
 [log_grep.inc] lines:   2

diff --git a/...ercona_slow_query_log_always_write.result → ...cona/r/slow_query_log_always_write.result b/...ercona_slow_query_log_always_write.result → ...cona/r/slow_query_log_always_write.result
diff --git a/...test/r/percona_slow_query_log_rate.result → ...uite/percona/r/slow_query_log_rate.result b/...test/r/percona_slow_query_log_rate.result → ...uite/percona/r/slow_query_log_rate.result
diff --git a/...na_slow_query_log_rate_limit_write.result → .../r/slow_query_log_rate_limit_write.result b/...na_slow_query_log_rate_limit_write.result → .../r/slow_query_log_rate_limit_write.result
diff --git a/...ow_query_log_use_global_control-cl.result → ...ow_query_log_use_global_control-cl.result b/...ow_query_log_use_global_control-cl.result → ...ow_query_log_use_global_control-cl.result
diff --git a/..._slow_query_log_use_global_control.result → .../slow_query_log_use_global_control.result b/..._slow_query_log_use_global_control.result → .../slow_query_log_use_global_control.result
diff --git a/...-test/r/percona_slowlog_query_info.result → ...suite/percona/r/slowlog_query_info.result b/...-test/r/percona_slowlog_query_info.result → ...suite/percona/r/slowlog_query_info.result
diff --git a/...test/r/percona_slowlog_size_limits.result → ...uite/percona/r/slowlog_size_limits.result b/...test/r/percona_slowlog_size_limits.result → ...uite/percona/r/slowlog_size_limits.result
diff --git a/mysql-test/r/ssl_bug70489.result → ...-test/suite/percona/r/ssl_bug70489.result b/mysql-test/r/ssl_bug70489.result → ...-test/suite/percona/r/ssl_bug70489.result
diff --git a/mysql-test/r/ssl_bug75311.result → ...-test/suite/percona/r/ssl_bug75311.result b/mysql-test/r/ssl_bug75311.result → ...-test/suite/percona/r/ssl_bug75311.result
diff --git a/...st/r/percona_ssl_connections_count.result → ...te/percona/r/ssl_connections_count.result b/...st/r/percona_ssl_connections_count.result → ...te/percona/r/ssl_connections_count.result
diff --git a/mysql-test/r/ssl_san.result → mysql-test/suite/percona/r/ssl_san.result b/mysql-test/r/ssl_san.result → mysql-test/suite/percona/r/ssl_san.result
diff --git a/mysql-test/r/ssl_san_ipv6.result → ...-test/suite/percona/r/ssl_san_ipv6.result b/mysql-test/r/ssl_san_ipv6.result → ...-test/suite/percona/r/ssl_san_ipv6.result
diff --git a/mysql-test/r/percona_sync_debug.result → mysql-test/suite/percona/r/sync_debug.result b/mysql-test/r/percona_sync_debug.result → mysql-test/suite/percona/r/sync_debug.result
diff --git a/..._open_cache_triggers_functionality.result → ..._open_cache_triggers_functionality.result b/..._open_cache_triggers_functionality.result → ..._open_cache_triggers_functionality.result
diff --git a/.../percona_tablespace_option_encrypt.result → ...ercona/r/tablespace_option_encrypt.result b/.../percona_tablespace_option_encrypt.result → ...ercona/r/tablespace_option_encrypt.result
diff --git a/mysql-test/r/tc-heuristic-recover.result → ...ite/percona/r/tc-heuristic-recover.result b/mysql-test/r/tc-heuristic-recover.result → ...ite/percona/r/tc-heuristic-recover.result
diff --git a/...l-test/r/percona_test_udf_wrappers.result → .../suite/percona/r/test_udf_wrappers.result b/...l-test/r/percona_test_udf_wrappers.result → .../suite/percona/r/test_udf_wrappers.result
diff --git a/mysql-test/r/threadpool_debug.result → ...t/suite/percona/r/threadpool_debug.result b/mysql-test/r/threadpool_debug.result → ...t/suite/percona/r/threadpool_debug.result
diff --git a/...est/r/transaction_isolation_change.result → ...ona/r/transaction_isolation_change.result b/...est/r/transaction_isolation_change.result → ...ona/r/transaction_isolation_change.result
diff --git a/mysql-test/r/percona_userstat.result → mysql-test/suite/percona/r/userstat.result b/mysql-test/r/percona_userstat.result → mysql-test/suite/percona/r/userstat.result
diff --git a/...t/r/percona_userstat_conn_handling.result → ...e/percona/r/userstat_conn_handling.result b/...t/r/percona_userstat_conn_handling.result → ...e/percona/r/userstat_conn_handling.result
diff --git a/mysql-test/r/percona_utility_user.result → ...-test/suite/percona/r/utility_user.result b/mysql-test/r/percona_utility_user.result → ...-test/suite/percona/r/utility_user.result
diff --git a/mysql-test/r/xa_binlog.result → mysql-test/suite/percona/r/xa_binlog.result b/mysql-test/r/xa_binlog.result → mysql-test/suite/percona/r/xa_binlog.result
diff --git a/mysql-test/t/aborted_clients.test → ...test/suite/percona/t/aborted_clients.test b/mysql-test/t/aborted_clients.test → ...test/suite/percona/t/aborted_clients.test
diff --git a/mysql-test/t/acl_mdl_scalability.test → .../suite/percona/t/acl_mdl_scalability.test b/mysql-test/t/acl_mdl_scalability.test → .../suite/percona/t/acl_mdl_scalability.test
diff --git a/mysql-test/t/backup_locks.test → mysql-test/suite/percona/t/backup_locks.test b/mysql-test/t/backup_locks.test → mysql-test/suite/percona/t/backup_locks.test
diff --git a/mysql-test/t/backup_locks_binlog_mixed.test → .../percona/t/backup_locks_binlog_mixed.test b/mysql-test/t/backup_locks_binlog_mixed.test → .../percona/t/backup_locks_binlog_mixed.test
diff --git a/mysql-test/t/backup_locks_binlog_row.test → ...te/percona/t/backup_locks_binlog_row.test b/mysql-test/t/backup_locks_binlog_row.test → ...te/percona/t/backup_locks_binlog_row.test
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		--let $key_length = 1024

		--source include/percona_encryption_udf_dh.inc
		--source ../include/encryption_udf_dh.inc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@

		--let $key_length = 4096

		--source include/percona_encryption_udf_dh.inc
		--source ../include/encryption_udf_dh.inc