diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-22 15:09:29 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-22 15:09:29 -0500 |
commit | e6c0f25f04c0dd6be7cd3973bf1a58dff213f985 (patch) | |
tree | 8dc496b9c929b3ce86845179c520eceb14055412 | |
parent | fe4047dc39090f626408d91999dd4a8f0869ab13 (diff) | |
parent | 70113ee170cbace52d01afdb3ddd4ea5bfa92ebd (diff) | |
download | mariadb-git-e6c0f25f04c0dd6be7cd3973bf1a58dff213f985.tar.gz |
Merge branch '5.5-galera' into 10.0-galera
-rw-r--r-- | sql/mysqld.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7c91b6f815a..53e7a65c59c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5134,18 +5134,18 @@ static int init_server_components() if (tmp->wsrep_applier == true) { /* - Set THR_THD to temporally point to this THD to register all the - variables that allocates memory for this THD. + Save/restore server_status and variables.option_bits and they get + altered during init_for_queries(). */ - THD *current_thd_saved= current_thd; - set_current_thd(tmp); + unsigned int server_status_saved= tmp->server_status; + ulonglong option_bits_saved= tmp->variables.option_bits; /* - Also save/restore server_status and variables.option_bits and they - get altered during init_for_queries(). + Set THR_THD to temporarily point to this THD to register all the + variables that allocates memory for this THD. */ - unsigned int server_status_saved= tmp->server_status; - ulonglong option_bits_saved= tmp->variables.option_bits; + THD *current_thd_saved= current_thd; + set_current_thd(tmp); tmp->init_for_queries(); |