database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge branch '5.5-galera' into 10.0-galera

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-12-22 15:09:29 -05:00
parent fe4047dc39 70113ee170
commit e6c0f25f04
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/mysqld.cc
View File

@@ -5134,19 +5134,19 @@ static int init_server_components()
if (tmp->wsrep_applier == true)
{
/*
Set THR_THD to temporally point to this THD to register all the
Save/restore server_status and variables.option_bits and they get
altered during init_for_queries().
*/
unsigned int server_status_saved= tmp->server_status;
ulonglong option_bits_saved= tmp->variables.option_bits;
/*
Set THR_THD to temporarily point to this THD to register all the
variables that allocates memory for this THD.
*/
THD *current_thd_saved= current_thd;
set_current_thd(tmp);
/*
Also save/restore server_status and variables.option_bits and they
get altered during init_for_queries().
*/
unsigned int server_status_saved= tmp->server_status;
ulonglong option_bits_saved= tmp->variables.option_bits;
tmp->init_for_queries();
/* Restore current_thd. */