Fixing the build break with PSI on

Summary:
MixedOther Jenkins configuration builds with PSI turned on. This exposed the problems which this diff fixes.
MySQLOnRocksDB/mysql-5.6#28

Test Plan: built

Reviewers: jonahcohen, hermanlee4

Differential Revision: https://reviews.facebook.net/D33603

Author: maykov

storage/rocksdb/ha_rocksdb.cc

@@ -672,8 +672,8 @@ static void init_rocksdb_psi_keys()
   count= array_elements(all_rocksdb_stages);
   mysql_stage_register(category, all_rocksdb_stages, count);
 
-  count= array_elements(all_server_threads);
-  mysql_thread_register(category, all_server_threads, count);
+  count= array_elements(all_rocksdb_threads);
+  mysql_thread_register(category, all_rocksdb_threads, count);
 }
 #endif
 

storage/rocksdb/rdb_cf_manager.cc

@@ -41,11 +41,14 @@ bool is_cf_name_reverse(const char *name)
     return false;
 }
 
+#ifdef HAVE_PSI_INTERFACE
+static PSI_mutex_key ex_key_cfm;
+#endif
 
 void Column_family_manager::init(std::vector<std::string> *names,
                                  std::vector<rocksdb::ColumnFamilyHandle*> *handles)
 {
-  mysql_mutex_init(NULL, &cfm_mutex, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(ex_key_cfm, &cfm_mutex, MY_MUTEX_INIT_FAST);
   DBUG_ASSERT(names->size() == handles->size());
   DBUG_ASSERT(names->size() > 0);