Bug #22849991 FIX CLANG WARNINGS AFTER WL#8041 PUSH (USE ORACLE KEY VAULT FOR KEYRING STORAGE)

(cherry picked from commit 3957b74548c31f6d88c79badc538a2180bdefd1c)

Author: Robert Golebiowski

plugin/keyring/keyring.cc

@@ -23,6 +23,11 @@
 #define MYSQL_DEFAULT_KEYRINGFILE MYSQL_KEYRINGDIR"/keyring"
 #endif
 
+using keyring::Buffered_file_io;
+using keyring::Key;
+using keyring::Keys_container;
+using keyring::Logger;
+
 my_bool create_keyring_dir_if_does_not_exist(const char *keyring_file_path)
 {
  if (!keyring_file_path || strlen(keyring_file_path) == 0)

plugin/keyring/keyring.h

@@ -23,7 +23,11 @@
 #include "keys_container.h"
 #include "keyring_memory.h"
 
-using namespace keyring;
+using keyring::IKeys_container;
+using keyring::IKeyring_io;
+using keyring::ILogger;
+using keyring::IKey;
+
 namespace keyring
 {
 /* Always defined. */

plugin/keyring/keyring_impl.cc

@@ -33,12 +33,12 @@ boost::movelib::unique_ptr<char[]> keyring_file_data(NULL);
 #ifdef HAVE_PSI_INTERFACE
 static PSI_rwlock_info all_keyring_rwlocks[]=
 {
- {&key_LOCK_keyring, "LOCK_keyring", 0}
+ {&keyring::key_LOCK_keyring, "LOCK_keyring", 0}
 };
 
 static PSI_memory_info all_keyring_memory[]=
 {
- {&key_memory_KEYRING, "KEYRING", 0}
+ {&keyring::key_memory_KEYRING, "KEYRING", 0}
 };
 
 void keyring_init_psi_keys(void)
@@ -56,7 +56,7 @@ void keyring_init_psi_keys(void)
 
 my_bool init_keyring_locks()
 {
- if (mysql_rwlock_init(key_LOCK_keyring, &LOCK_keyring))
+ if (mysql_rwlock_init(keyring::key_LOCK_keyring, &LOCK_keyring))
  return TRUE;
  return FALSE;
 }
@@ -96,10 +96,10 @@ my_bool mysql_key_fetch(boost::movelib::unique_ptr<IKey> key_to_fetch, char **ke
  {
  *key_len = fetched_key->get_key_data_size();
  fetched_key->xor_data();
- *reinterpret_cast<uchar **>(key)=fetched_key->release_key_data();
- *key_type = my_strdup(key_memory_KEYRING,
-  fetched_key->get_key_type()->c_str(),
-  MYF(MY_WME));
+ *key= static_cast<void*>(fetched_key->release_key_data());
+ *key_type= my_strdup(keyring::key_memory_KEYRING,
+ fetched_key->get_key_type()->c_str(),
+ MYF(MY_WME));
  }
  else
  *key = NULL;