summaryrefslogtreecommitdiff
path: root/storage/oqgraph
diff options
context:
space:
mode:
authorAndrew McDonnell <bugs@andrewmcdonnell.net>2016-01-22 21:13:33 +1030
committerSergei Golubchik <serg@mariadb.org>2016-04-24 18:15:20 +0200
commit6651005e623e3a12ca0af6a645483a165941f8fe (patch)
tree89210ed486a61b20788158dc60b4aebb6207ac4d /storage/oqgraph
parent011497bd6035d0eceb6488b62319a86831418fae (diff)
downloadmariadb-git-6651005e623e3a12ca0af6a645483a165941f8fe.tar.gz
Fix for MDEV-8206, as per Jira comments of 2015-11-16 and 2015-11-30
Diffstat (limited to 'storage/oqgraph')
-rw-r--r--storage/oqgraph/ha_oqgraph.cc4
1 files changed, 4 insertions, 0 deletions
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);
}