diff --git a/sql/server_component/mysql_server_keyring_lockable_imp.cc b/sql/server_component/mysql_server_keyring_lockable_imp.cc index 9c94d2ee8c5..7b6eb414e7d 100644 --- a/sql/server_component/mysql_server_keyring_lockable_imp.cc +++ b/sql/server_component/mysql_server_keyring_lockable_imp.cc @@ -391,7 +391,8 @@ DEFINE_BOOL_METHOD(Keyring_metadata_query_service_impl::is_initialized, ()) { DEFINE_BOOL_METHOD(Keyring_metadata_query_service_impl::init, (my_h_keyring_component_metadata_iterator * metadata_iterator)) { - if (check_service(internal_keyring_component_metadata_query, + if (internal_keyring_component_metadata_query == nullptr || + check_service(internal_keyring_component_metadata_query, COMPONENT_METADATA_QUERY)) return true;