From 3d915225611a921fad03934e58bf281b48fc15b0 Mon Sep 17 00:00:00 2001 From: Marc Alff Date: Wed, 6 Jan 2010 22:42:07 -0700 Subject: WL#2360 Performance schema Part IV: sql instrumentation --- sql/sql_class.h | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'sql/sql_class.h') diff --git a/sql/sql_class.h b/sql/sql_class.h index 03f06e5aa26..b3cc1fc68c0 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -775,7 +775,7 @@ typedef struct st_xid_state { uint rm_error; } XID_STATE; -extern pthread_mutex_t LOCK_xid_cache; +extern mysql_mutex_t LOCK_xid_cache; extern HASH xid_cache; bool xid_cache_init(void); void xid_cache_free(void); @@ -1236,7 +1236,7 @@ public: - thd->mysys_var (used by KILL statement and shutdown). Is locked when THD is deleted. */ - pthread_mutex_t LOCK_thd_data; + mysql_mutex_t LOCK_thd_data; /* all prepared statements and cursors of this connection */ Statement_map stmt_map; @@ -1810,15 +1810,15 @@ public: #ifdef SIGNAL_WITH_VIO_CLOSE inline void set_active_vio(Vio* vio) { - pthread_mutex_lock(&LOCK_thd_data); + mysql_mutex_lock(&LOCK_thd_data); active_vio = vio; - pthread_mutex_unlock(&LOCK_thd_data); + mysql_mutex_unlock(&LOCK_thd_data); } inline void clear_active_vio() { - pthread_mutex_lock(&LOCK_thd_data); + mysql_mutex_lock(&LOCK_thd_data); active_vio = 0; - pthread_mutex_unlock(&LOCK_thd_data); + mysql_mutex_unlock(&LOCK_thd_data); } void close_active_vio(); #endif @@ -1865,12 +1865,6 @@ public: proc_info = msg; return old_msg; } - inline const char* enter_cond(pthread_cond_t *cond, pthread_mutex_t *mutex, - const char *msg) - { - /* TO BE REMOVED: temporary helper, to help with merges */ - return enter_cond((mysql_cond_t*) cond, (mysql_mutex_t*) mutex, msg); - } inline void exit_cond(const char* old_msg) { /* -- cgit v1.2.1