[Commits] f5e0dbc: MDEV-9290 : InnoDB: Assertion failure in file trx0sys.cc line 353

Nirbhay Choubey nirbhay at mariadb.com
Tue Dec 22 21:51:02 EET 2015


revision-id: f5e0dbc464dbbf63aa9e12076acb60e8acb0fa6a (mariadb-galera-5.5.46-3-gf5e0dbc)
parent(s): 3f515a09ff13d5ee242de121b0162dd4b39db219
author: Nirbhay Choubey
committer: Nirbhay Choubey
timestamp: 2015-12-22 14:51:01 -0500
message:

MDEV-9290 : InnoDB: Assertion failure in file trx0sys.cc line 353

Addendum: Save thd's server_status & option_bits before setting the thread specific pointer.

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

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index fe74a82..3e2cc40 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4611,18 +4611,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;
-        my_pthread_setspecific_ptr(THR_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);
 
         tmp->init_for_queries();
 


More information about the commits mailing list