diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:13:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-22 16:13:54 +0200 |
| commit | 1fd8150a5b5e3f56aa3c253225929a07ee9a4026 (patch) | |
| tree | 6fb814b28d2a0b8227b7a9f835f2b888c2a2596f /sql/sql_class.h | |
| parent | 60561ae6133cf40f4fc445e1d6e8f395a20b2573 (diff) | |
| parent | 115a2967563d3ac734ce371260098710ba42cdf0 (diff) | |
| download | mariadb-git-1fd8150a5b5e3f56aa3c253225929a07ee9a4026.tar.gz | |
5.1 merge
increase xtradb verson from 13.0 to 13.01
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 14f4f022de3..ece63fb2326 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1325,6 +1325,8 @@ class THD :public Statement, public: /* Used to execute base64 coded binlog events in MySQL server */ Relay_log_info* rli_fake; + /* Slave applier execution context */ + Relay_log_info* rli_slave; /* Constant for THD::where initialization in the beginning of every query. @@ -1376,11 +1378,23 @@ public: Protects THD data accessed from other threads: - thd->query and thd->query_length (used by SHOW ENGINE INNODB STATUS and SHOW PROCESSLIST - - thd->mysys_var (used by KILL statement and shutdown). - Is locked when THD is deleted. */ pthread_mutex_t LOCK_thd_data; + /** + - Protects thd->mysys_var (used during KILL statement and shutdown). + - Is Locked when THD is deleted. + + Note: This responsibility was earlier handled by LOCK_thd_data. + This lock is introduced to solve a deadlock issue waiting for + LOCK_thd_data. As this lock reduces responsibility of LOCK_thd_data + the deadlock issues is solved. + Caution: LOCK_thd_kill should not be taken while holding LOCK_thd_data. + THD::awake() currently takes LOCK_thd_data after holding + LOCK_thd_kill. + */ + pthread_mutex_t LOCK_thd_kill; + /* all prepared statements and cursors of this connection */ Statement_map stmt_map; /* @@ -2140,7 +2154,6 @@ public: void add_changed_table(const char *key, long key_length); CHANGED_TABLE_LIST * changed_table_dup(const char *key, long key_length); int send_explain_fields(select_result *result); -#ifndef EMBEDDED_LIBRARY /** Clear the current error, if any. We do not clear is_fatal_error or is_fatal_sub_stmt_error since we @@ -2156,9 +2169,9 @@ public: is_slave_error= 0; DBUG_VOID_RETURN; } +#ifndef EMBEDDED_LIBRARY inline bool vio_ok() const { return net.vio != 0; } #else - void clear_error(); inline bool vio_ok() const { return true; } #endif /** |