diff options
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index f544b2a9c20..b0276e14ebf 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -7476,7 +7476,6 @@ static int connect_callback() } extern int ndb_dictionary_is_mysqld; -extern mysql_mutex_t LOCK_plugin; #ifdef HAVE_PSI_INTERFACE @@ -7569,13 +7568,6 @@ static int ndbcluster_init(void *p) init_ndbcluster_psi_keys(); #endif - /* - Below we create new THD's. They'll need LOCK_plugin, but it's taken now by - plugin initialization code. Release it to avoid deadlocks. It's safe, as - there're no threads that may concurrently access plugin control structures. - */ - mysql_mutex_unlock(&LOCK_plugin); - mysql_mutex_init(key_ndbcluster_mutex, &ndbcluster_mutex, MY_MUTEX_INIT_FAST); mysql_mutex_init(key_LOCK_ndb_util_thread, @@ -7732,8 +7724,6 @@ static int ndbcluster_init(void *p) goto ndbcluster_init_error; } - mysql_mutex_lock(&LOCK_plugin); - ndbcluster_inited= 1; DBUG_RETURN(FALSE); @@ -7746,8 +7736,6 @@ ndbcluster_init_error: g_ndb_cluster_connection= NULL; ndbcluster_hton->state= SHOW_OPTION_DISABLED; // If we couldn't use handler - mysql_mutex_lock(&LOCK_plugin); - DBUG_RETURN(TRUE); } |