percona · altmannmarcelo · Oct 24, 2023 · Sep 7, 2023 · Sep 11, 2023 · Jan 2, 2023
diff --git a/components/keyrings/common/data/data.h b/components/keyrings/common/data/data.h
@@ -23,6 +23,7 @@
 #ifndef DATA_INCLUDED
 #define DATA_INCLUDED
 
+#include <cstdint>
 #include <functional>
 #include <string>
 #include "pfs_string.h"

diff --git a/mysql-test/include/have_component_keyring_kmip.inc b/mysql-test/include/have_component_keyring_kmip.inc
diff --git a/mysql-test/include/have_component_keyring_kms.inc b/mysql-test/include/have_component_keyring_kms.inc
diff --git a/mysql-test/include/have_keyring_kmip_plugin.inc b/mysql-test/include/have_keyring_kmip_plugin.inc
diff --git a/mysql-test/include/keyring_tests/helper/local_keyring_kmip_remove.inc b/mysql-test/include/keyring_tests/helper/local_keyring_kmip_remove.inc
diff --git a/mysql-test/include/keyring_tests/helper/local_keyring_kms_remove.inc b/mysql-test/include/keyring_tests/helper/local_keyring_kms_remove.inc
diff --git a/mysql-test/include/keyring_tests/mats/keyring_udf_test.inc b/mysql-test/include/keyring_tests/mats/keyring_udf_test.inc
@@ -23,10 +23,8 @@
 --echo # Tests for AES key type
 --source keyring_udf_aes_test.inc
 
---if (!$skip_secret_tests) {
 --echo # Tests for SECRET key type
 --source keyring_udf_secret_test.inc
--- }
 
 --echo # ----------------------------------------------------------------------
 

diff --git a/mysql-test/include/keyring_tests/mats/mysql_ts_alter_encrypt_1.inc b/mysql-test/include/keyring_tests/mats/mysql_ts_alter_encrypt_1.inc
@@ -192,9 +192,9 @@ ALTER TABLESPACE mysql ENCRYPTION='N';
 SET debug='+d,skip_dd_table_access_check';
 
 --echo # Wait for Unencryption processing to finish in background thread
-let $wait_condition = SELECT ENCRYPTION = 'N'
-        FROM INFORMATION_SCHEMA.INNODB_TABLESPACES
-        WHERE NAME='mysql';
+let $wait_condition = select count(*) = 0
+        from performance_schema.events_stages_current
+        where EVENT_NAME='stage/innodb/alter tablespace (encryption)';
 --source include/wait_condition.inc
 
 # Encrytion property of tablespace should have changed i.e. it should be

diff --git a/mysql-test/std_data/kmip_clear.py b/mysql-test/std_data/kmip_clear.py
diff --git a/mysql-test/suite/component_keyring_kmip/inc/setup_component.inc b/mysql-test/suite/component_keyring_kmip/inc/setup_component.inc
diff --git a/mysql-test/suite/component_keyring_kmip/inc/setup_component_customized.inc b/mysql-test/suite/component_keyring_kmip/inc/setup_component_customized.inc
diff --git a/mysql-test/suite/component_keyring_kmip/inc/teardown_component.inc b/mysql-test/suite/component_keyring_kmip/inc/teardown_component.inc
diff --git a/mysql-test/suite/component_keyring_kmip/inc/teardown_component_customized.inc b/mysql-test/suite/component_keyring_kmip/inc/teardown_component_customized.inc