diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 14:25:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-06 14:25:20 +0300 |
| commit | 780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e (patch) | |
| tree | b7447115f45de0f03bbe18c26fc0866367483066 /sql/wsrep_client_service.cc | |
| parent | db9e41ddc31f2e705a54132cf69c781e1cc60f07 (diff) | |
| parent | 18af13b88ba580562981a190c25da128a2e9db26 (diff) | |
| download | mariadb-git-780d2bb8a7eca4fdbdf70fbd51c0bdbae5b0057e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_client_service.cc')
| -rw-r--r-- | sql/wsrep_client_service.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sql/wsrep_client_service.cc b/sql/wsrep_client_service.cc index 0fa10c1c9ea..8d58f62bd03 100644 --- a/sql/wsrep_client_service.cc +++ b/sql/wsrep_client_service.cc @@ -29,9 +29,9 @@ #include "slave.h" /* opt_log_slave_updates */ #include "transaction.h" /* trans_commit()... */ #include "log.h" /* stmt_has_updated_trans_table() */ -//#include "debug_sync.h" #include "mysql/service_debug_sync.h" #include "mysql/psi/mysql_thread.h" /* mysql_mutex_assert_owner() */ + namespace { @@ -56,16 +56,12 @@ Wsrep_client_service::Wsrep_client_service(THD* thd, void Wsrep_client_service::store_globals() { - DBUG_ENTER("Wsrep_client_service::store_globals"); - m_thd->store_globals(); - DBUG_VOID_RETURN; + wsrep_store_threadvars(m_thd); } void Wsrep_client_service::reset_globals() { - DBUG_ENTER("Wsrep_client_service::reset_globals"); - m_thd->reset_globals(); - DBUG_VOID_RETURN; + wsrep_reset_threadvars(m_thd); } bool Wsrep_client_service::interrupted( |