diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-11-14 20:05:35 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-11-14 20:05:35 +0100 |
| commit | 10aa5764835ba5bc5fa49a1051e1cc647c0f301b (patch) | |
| tree | 951d6bc7bf5f5958141bdaab19ea8fb9be5c915f /sql/sql_class.h | |
| parent | 6083c5a05407dcb137e4ae1d39b944c9c392c48e (diff) | |
| parent | 81b9c78500a9326a85290992a9340eb887b74048 (diff) | |
| download | mariadb-git-10aa5764835ba5bc5fa49a1051e1cc647c0f301b.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index f6b772ef439..73b0f36611b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3447,7 +3447,7 @@ public: void awake_no_mutex(killed_state state_to_set); void awake(killed_state state_to_set) { - bool wsrep_on_local= WSREP_NNULL(this); + bool wsrep_on_local= variables.wsrep_on; /* mutex locking order (LOCK_thd_data - LOCK_thd_kill)) requires to grab LOCK_thd_data here |