From e6ce97a592858cf7274f045150e5208128e2c35a Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Wed, 13 Sep 2017 21:02:44 +0200
Subject: [PATCH] MDEV-12951 Server crash [mysqld got exception 0xc0000005]

Same as MDEV-12725 but for federated (not X).
Set and reset mysql.net->thd appropriately.
---
 .../federated/net_thd_crash-12951.result      | 11 +++++++++
 .../suite/federated/net_thd_crash-12951.test  | 23 +++++++++++++++++++
 storage/federated/ha_federated.cc             |  9 ++++++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 mysql-test/suite/federated/net_thd_crash-12951.result
 create mode 100644 mysql-test/suite/federated/net_thd_crash-12951.test

diff --git a/mysql-test/suite/federated/net_thd_crash-12951.result b/mysql-test/suite/federated/net_thd_crash-12951.result
new file mode 100644
index 00000000000..573ac96efff
--- /dev/null
+++ b/mysql-test/suite/federated/net_thd_crash-12951.result
@@ -0,0 +1,11 @@
+set global query_cache_size= 16*1024*1024;
+set global query_cache_type= 1;
+create table t1 (i int) engine=innodb;
+create table t2 (i int) engine=federated 
+CONNECTION="mysql://root@localhost:MASTER_MYPORT/test/t1";
+select * from t2;
+i
+drop table t2;
+drop table t1;
+set global query_cache_type= default;
+set global query_cache_size= default;
diff --git a/mysql-test/suite/federated/net_thd_crash-12951.test b/mysql-test/suite/federated/net_thd_crash-12951.test
new file mode 100644
index 00000000000..81cd826686e
--- /dev/null
+++ b/mysql-test/suite/federated/net_thd_crash-12951.test
@@ -0,0 +1,23 @@
+#
+# MDEV-12951 Server crash [mysqld got exception 0xc0000005]
+#
+
+--source include/have_innodb.inc
+ 
+set global query_cache_size= 16*1024*1024;
+set global query_cache_type= 1;
+ 
+create table t1 (i int) engine=innodb;
+--replace_result $MASTER_MYPORT MASTER_MYPORT
+eval create table t2 (i int) engine=federated 
+  CONNECTION="mysql://root@localhost:$MASTER_MYPORT/test/t1";
+ 
+select * from t2;
+
+source include/restart_mysqld.inc;
+
+drop table t2;
+drop table t1;
+
+set global query_cache_type= default;
+set global query_cache_size= default;
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index cd4c0fe2c40..6b88ab6f2bb 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -2980,6 +2980,9 @@ int ha_federated::reset(void)
   }
   reset_dynamic(&results);
 
+  if (mysql)
+    mysql->net.thd= NULL;
+
   return 0;
 }
 
@@ -3200,11 +3203,13 @@ int ha_federated::real_query(const char *query, size_t length)
   int rc= 0;
   DBUG_ENTER("ha_federated::real_query");
 
+  if (!query || !length)
+    goto end;
+
   if (!mysql && (rc= real_connect()))
     goto end;
 
-  if (!query || !length)
-    goto end;
+  mysql->net.thd= table->in_use;
 
   rc= mysql_real_query(mysql, query, (uint) length);