From 6651005e623e3a12ca0af6a645483a165941f8fe Mon Sep 17 00:00:00 2001
From: Andrew McDonnell <bugs@andrewmcdonnell.net>
Date: Fri, 22 Jan 2016 21:13:33 +1030
Subject: [PATCH] Fix for MDEV-8206, as per Jira comments of 2015-11-16 and
 2015-11-30

---
 storage/oqgraph/ha_oqgraph.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/storage/oqgraph/ha_oqgraph.cc b/storage/oqgraph/ha_oqgraph.cc
index f5412c3b83a..ec12cebe53a 100644
--- a/storage/oqgraph/ha_oqgraph.cc
+++ b/storage/oqgraph/ha_oqgraph.cc
@@ -1103,6 +1103,10 @@ int ha_oqgraph::info(uint flag)
 
 int ha_oqgraph::extra(enum ha_extra_function operation)
 {
+  if (graph->get_thd() != current_thd) {
+    DBUG_PRINT( "oq-debug", ("rnd_pos g->table->in_use: 0x%lx <-- current_thd 0x%lx", (long) graph->get_thd(), (long) current_thd));
+    graph->set_thd(current_thd);
+  }
   return edges->file->extra(operation);
 }