diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-11 13:12:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-11 13:15:10 +0200 |
| commit | c9717dc0190731c656cce31fa6e39a3db123e3af (patch) | |
| tree | 3db056a3f50e565294d127edb5339afb0a994749 /sql/sql_class.cc | |
| parent | 33721d91389759a917463a044fbd6f0b7654d629 (diff) | |
| parent | 1d411a8a440922f0538c1be254d6f4396af453a1 (diff) | |
| download | mariadb-git-c9717dc0190731c656cce31fa6e39a3db123e3af.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 36f1dc72342..92795a8f797 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -881,7 +881,6 @@ THD::THD(my_thread_id id, bool is_wsrep_applier, bool skip_global_sys_var_lock) *scramble= '\0'; #ifdef WITH_WSREP - mysql_mutex_init(key_LOCK_wsrep_thd, &LOCK_wsrep_thd, MY_MUTEX_INIT_FAST); wsrep_ws_handle.trx_id = WSREP_UNDEFINED_TRX_ID; wsrep_ws_handle.opaque = NULL; wsrep_retry_counter = 0; @@ -1718,9 +1717,6 @@ THD::~THD() mysql_mutex_unlock(&LOCK_thd_kill); #ifdef WITH_WSREP - mysql_mutex_lock(&LOCK_wsrep_thd); - mysql_mutex_unlock(&LOCK_wsrep_thd); - mysql_mutex_destroy(&LOCK_wsrep_thd); delete wsrep_rgi; #endif if (!free_connection_done) |