diff options
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index b0f68aa8fab..e3e3827e32b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3171,7 +3171,7 @@ public: /* If checking this in conjunction with a wait condition, please include a check after enter_cond() if you want to avoid a race - condition. For details see the implementation of awake(), + condition. For details see the implementation of kill_me_pls(), especially the "broadcast" part. */ killed_state volatile killed; @@ -3436,8 +3436,8 @@ public: } void close_active_vio(); #endif - void awake_no_mutex(killed_state state_to_set); - void awake(killed_state state_to_set) + void kill_me_pls_no_mutex(killed_state state_to_set); + void kill_me_pls(killed_state state_to_set) { bool wsrep_on_local= WSREP_NNULL(this); /* @@ -3447,7 +3447,7 @@ public: if (wsrep_on_local) mysql_mutex_lock(&LOCK_thd_data); mysql_mutex_lock(&LOCK_thd_kill); - awake_no_mutex(state_to_set); + kill_me_pls_no_mutex(state_to_set); mysql_mutex_unlock(&LOCK_thd_kill); if (wsrep_on_local) mysql_mutex_unlock(&LOCK_thd_data); @@ -3507,7 +3507,7 @@ public: Putting the mutex unlock in thd->exit_cond() ensures that mysys_var->current_mutex is always unlocked _before_ mysys_var->mutex is locked (if that would not be the case, you'll get a deadlock if someone - does a THD::awake() on you). + does a THD::kill_me_pls() on you). */ mysql_mutex_unlock(mysys_var->current_mutex); mysql_mutex_lock(&mysys_var->mutex); @@ -4957,6 +4957,9 @@ private: } public: + + void awake_me(); + #ifdef HAVE_REPLICATION /* If we do a purge of binary logs, log index info of the threads |