diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-17 09:07:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-17 09:07:52 +0300 |
| commit | 46a6cea5c58a7607baaf4174673dd07737e75b76 (patch) | |
| tree | 263fc1c6e02df3da6ed0661b3c0a0e4350dbc818 /sql/wsrep_thd.cc | |
| parent | 74551b2b6fc6a3db367d012eb4a31453f8215d6f (diff) | |
| parent | c793f07841afa5c24ffdbd476a5453d03a65eac0 (diff) | |
| download | mariadb-git-46a6cea5c58a7607baaf4174673dd07737e75b76.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_thd.cc')
| -rw-r--r-- | sql/wsrep_thd.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_thd.cc b/sql/wsrep_thd.cc index 50f0376f674..f5cce69b1d0 100644 --- a/sql/wsrep_thd.cc +++ b/sql/wsrep_thd.cc @@ -455,8 +455,8 @@ void wsrep_delete_threadvars() DBUG_ASSERT(pthread_getspecific(THR_KEY_mysys)); /* Reset psi state to avoid deallocating applier thread psi_thread. */ - PSI_thread *psi_thread= PSI_CALL_get_thread(); #ifdef HAVE_PSI_INTERFACE + PSI_thread *psi_thread= PSI_CALL_get_thread(); if (PSI_server) { PSI_server->set_thread(0); |