diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 11:30:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-26 11:30:20 +0300 |
| commit | 1e08e08ccb8896c1f0d2f673c16f5b92cdf7dc46 (patch) | |
| tree | 2bcef1f1398c85a665743208ec0a856f884b6a84 /sql/wsrep_utils.cc | |
| parent | 88e70f4caea34e0d7677b1fa646151b8b87dd3ab (diff) | |
| parent | 6a042281bdbfe91cc39e1f6e02295bfe7eaa9d43 (diff) | |
| download | mariadb-git-1e08e08ccb8896c1f0d2f673c16f5b92cdf7dc46.tar.gz | |
Merge 10.3 into 10.4
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 49ea78a3872..4cf131fd974 100644 --- a/sql/wsrep_utils.cc +++ b/sql/wsrep_utils.cc @@ -417,7 +417,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) { @@ -426,6 +426,8 @@ thd::thd (my_bool won) : init(), ptr(new THD(0)) wsrep_store_threadvars(ptr); 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); } |