From 9eba34f08675c31b0796eeb127582be827773070 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Thu, 28 Apr 2016 22:18:15 +0200
Subject: [PATCH] Fix crash due to heap corruption in main.shm

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

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 177018dd171..4dfe45683d6 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6642,7 +6642,7 @@ pthread_handler_t handle_connections_shared_memory(void *arg)
     thd->security_ctx->host= my_strdup(my_localhost, MYF(0)); /* Host is unknown */
     create_new_thread(thd);
     connect_number++;
-    set_current_thd(thd);
+    set_current_thd(0);
     continue;
 
 errorconn: