[Commits] e6c0f25: Merge branch '5.5-galera' into 10.0-galera

Nirbhay Choubey nirbhay at mariadb.com
Tue Dec 22 22:09:29 EET 2015


revision-id: e6c0f25f04c0dd6be7cd3973bf1a58dff213f985 (mariadb-galera-10.0.22-11-ge6c0f25)
parent(s): fe4047dc39090f626408d91999dd4a8f0869ab13 70113ee170cbace52d01afdb3ddd4ea5bfa92ebd
author: Nirbhay Choubey
committer: Nirbhay Choubey
timestamp: 2015-12-22 15:09:29 -0500
message:

Merge branch '5.5-galera' into 10.0-galera


 sql/mysqld.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --cc sql/mysqld.cc
index 7c91b6f,3e2cc40..53e7a65
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@@ -5134,18 -4611,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;
 -        my_pthread_setspecific_ptr(THR_THD, tmp);
++        set_current_thd(tmp);
  
          tmp->init_for_queries();
  


More information about the commits mailing list