diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 10:45:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 10:45:47 +0300 |
| commit | 6a042281bdbfe91cc39e1f6e02295bfe7eaa9d43 (patch) | |
| tree | 54ae0a1b6b234dd1a1b6c4c93528be18197365e4 /sql/wsrep_utils.cc | |
| parent | 65f30050aafb3821ba63a3b837c98cf4d2334254 (diff) | |
| parent | 21a96581fd1dd11c5605dd89e3adbaabdf6de5eb (diff) | |
| download | mariadb-git-6a042281bdbfe91cc39e1f6e02295bfe7eaa9d43.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/wsrep_utils.cc')
| -rw-r--r-- | sql/wsrep_utils.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/wsrep_utils.cc b/sql/wsrep_utils.cc index 6230bcbe529..ae8fb63ef34 100644 --- a/sql/wsrep_utils.cc +++ b/sql/wsrep_utils.cc @@ -414,7 +414,7 @@ process::wait () return err_; } -thd::thd (my_bool won) : init(), ptr(new THD(0)) +thd::thd (my_bool won, bool system_thread) : init(), ptr(new THD(0)) { if (ptr) { @@ -422,6 +422,8 @@ thd::thd (my_bool won) : init(), ptr(new THD(0)) ptr->store_globals(); ptr->variables.option_bits&= ~OPTION_BIN_LOG; // disable binlog ptr->variables.wsrep_on = won; + if (system_thread) + ptr->system_thread= SYSTEM_THREAD_GENERIC; ptr->security_ctx->master_access= ~(ulong)0; lex_start(ptr); } |