From 2a471e8e98478ba3618d2556b0059e3bf06767d9 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 14 Oct 2015 15:29:57 +0200
Subject: [PATCH] fix func_hybrid_type crash in --ps --embedded

create_embedded_thd() must reset current_thd before returning,
otherwise client [de-]allocations will be happening in that
stray THD context
---
 libmysqld/lib_sql.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index eb854a9f076..86a0676d97e 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -701,6 +701,7 @@ void *create_embedded_thd(int client_flag)
   threads.append(thd);
   mysql_mutex_unlock(&LOCK_thread_count);
   thd->mysys_var= 0;
+  thd->reset_globals();
   return thd;
 err:
   delete(thd);