Bug #33705056: Assertion failure on double LOCK_plugin inside page_track_service in debug mode

Post-push fix: error: unused variable 'LOCK_plugin' [-Werror=unused-variable] Change-Id: I89b1516acb953eb3ed28544569b00153334a8882 (cherry picked from commit e3c526539ee59450b163830e44c57da8656d612e)

Author: Tor Didriksen

storage/perfschema/pfs_variable.cc

@@ -91,8 +91,10 @@ bool PFS_system_variable_cache::init_show_var_array(enum_var_type scope,
  assert(!m_initialized);
  m_query_scope = scope;
 
+#ifndef NDEBUG
  extern mysql_mutex_t LOCK_plugin;
  mysql_mutex_assert_not_owner(&LOCK_plugin);
+#endif
  mysql_rwlock_rdlock(&LOCK_system_variables_hash);
  DEBUG_SYNC(m_current_thd, "acquired_LOCK_system_variables_hash");
 

storage/perfschema/table_session_variables.cc

@@ -90,8 +90,10 @@ PFS_engine_table *table_session_variables::create(PFS_engine_table_share *) {
 
 ha_rows table_session_variables::get_row_count(void) {
  mysql_mutex_lock(&LOCK_plugin_delete);
+#ifndef NDEBUG
  extern mysql_mutex_t LOCK_plugin;
  mysql_mutex_assert_not_owner(&LOCK_plugin);
+#endif
  mysql_rwlock_rdlock(&LOCK_system_variables_hash);
  ha_rows system_var_count = get_system_variable_count();
  mysql_rwlock_unlock(&LOCK_system_variables_hash);

storage/perfschema/table_variables_by_thread.cc

@@ -101,8 +101,10 @@ PFS_engine_table *table_variables_by_thread::create(PFS_engine_table_share *) {
 
 ha_rows table_variables_by_thread::get_row_count(void) {
  mysql_mutex_lock(&LOCK_plugin_delete);
+#ifndef NDEBUG
  extern mysql_mutex_t LOCK_plugin;
  mysql_mutex_assert_not_owner(&LOCK_plugin);
+#endif
  mysql_rwlock_rdlock(&LOCK_system_variables_hash);
  ulong system_var_count = get_system_variable_count();
  mysql_rwlock_unlock(&LOCK_system_variables_hash);

storage/perfschema/table_variables_info.cc

@@ -87,8 +87,10 @@ PFS_engine_table *table_variables_info::create(PFS_engine_table_share *) {
 
 ha_rows table_variables_info::get_row_count(void) {
  mysql_mutex_lock(&LOCK_plugin_delete);
+#ifndef NDEBUG
  extern mysql_mutex_t LOCK_plugin;
  mysql_mutex_assert_not_owner(&LOCK_plugin);
+#endif
  mysql_rwlock_rdlock(&LOCK_system_variables_hash);
  ha_rows system_var_count = get_system_variable_count();
  mysql_rwlock_unlock(&LOCK_system_variables_hash);