diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 13:01:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-10 13:01:42 +0200 |
| commit | 9b1824dcd2564c803e58d02ac63b49ec68bd60d2 (patch) | |
| tree | beef3faf3e0e6b8264014a0cfb735d4a32be6cbc /sql/sql_class.h | |
| parent | 92a13148e80c30422ae5460032169cbe1946fa6d (diff) | |
| parent | ff579bc814551026a3271fac274f560cef3f523f (diff) | |
| download | mariadb-git-9b1824dcd2564c803e58d02ac63b49ec68bd60d2.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index cd31e0356e8..1e866e1da6d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -4369,7 +4369,6 @@ public: query_id_t wsrep_last_query_id; enum wsrep_query_state wsrep_query_state; enum wsrep_conflict_state wsrep_conflict_state; - mysql_mutex_t LOCK_wsrep_thd; wsrep_trx_meta_t wsrep_trx_meta; uint32 wsrep_rand; Relay_log_info *wsrep_rli; |