From 2f90221ad49eb87b241ffcaf42e315c6a59ae1c3 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@skysql.com>
Date: Wed, 21 May 2014 11:23:59 -0400
Subject: [PATCH] Fixed a segfault issue by initializing thd's
 system_thread_info in wsrep applier threads, introduced by MDEV#6156.

---
 sql/mysqld.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 89d0b0281b2..82f6bfc053c 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5260,6 +5260,7 @@ typedef void (*wsrep_thd_processor_fun)(THD *);
 pthread_handler_t start_wsrep_THD(void *arg)
 {
   THD *thd;
+  rpl_sql_thread_info sql_info(NULL);
   wsrep_thd_processor_fun processor= (wsrep_thd_processor_fun)arg;
 
   if (my_thread_init())
@@ -5290,6 +5291,7 @@ pthread_handler_t start_wsrep_THD(void *arg)
   thd->bootstrap=1;
   thd->max_client_packet_length= thd->net.max_packet;
   thd->security_ctx->master_access= ~(ulong)0;
+  thd->system_thread_info.rpl_sql_info= &sql_info;
 
   /* from handle_one_connection... */
   pthread_detach_this_thread();