From 699b3909f78c0f354ced5c3670ca4a39e7340d17 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Wed, 6 Sep 2017 13:45:39 +0300
Subject: [PATCH] Set current_dcb to NULL if the current DCB is deleted

---
 server/core/dcb.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server/core/dcb.cc b/server/core/dcb.cc
index 488554fbd..01a18d153 100644
--- a/server/core/dcb.cc
+++ b/server/core/dcb.cc
@@ -266,6 +266,12 @@ dcb_final_free(DCB *dcb)
 void
 dcb_free_all_memory(DCB *dcb)
 {
+    // This needs to be done here because session_free() calls this directly.
+    if (this_thread.current_dcb == dcb)
+    {
+        this_thread.current_dcb = NULL;
+    }
+
     DCB_CALLBACK *cb_dcb;
 
     if (dcb->protocol)