VladPolskiy/MariaDB-open-code
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-15 22:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-26 10:45:47 +03:00
parent 65f30050aa 21a96581fd
commit 6a042281bd
15 changed files with 126 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/wsrep_utils.cc
View File

@ -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);
}