database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-08-26 11:30:20 +03:00
parent 88e70f4cae 6a042281bd
commit 1e08e08ccb
22 changed files with 219 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/wsrep_utils.cc
View File

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