summaryrefslogtreecommitdiff
path: root/storage/oqgraph
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-03-17 17:41:45 +0100
committerSergei Golubchik <serg@mariadb.org>2016-03-21 11:43:19 +0100
commitd158ba62f71ddcc09ecbaff9a73e456e62e2f2e8 (patch)
tree138e0ee489da86e3e8e53528131ecfaa1711e824 /storage/oqgraph
parenta2de604309e9b95292bfe81310ae247f6bfbee90 (diff)
downloadmariadb-git-d158ba62f71ddcc09ecbaff9a73e456e62e2f2e8.tar.gz
ASAN error in OQGraph engine
Fixed more cases for MDEV-6282
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 89bc9128c29..f5412c3b83a 100644
--- a/storage/oqgraph/ha_oqgraph.cc
+++ b/storage/oqgraph/ha_oqgraph.cc
@@ -715,6 +715,10 @@ int ha_oqgraph::open(const char *name, int mode, uint test_if_locked)
int ha_oqgraph::close(void)
{
DBUG_PRINT( "oq-debug", ("close()"));
+ if (graph->get_thd() != current_thd) {
+ DBUG_PRINT( "oq-debug", ("index_next_same g->table->in_use: 0x%lx <-- current_thd 0x%lx", (long) graph->get_thd(), (long) current_thd));
+ graph->set_thd(current_thd);
+ }
oqgraph::free(graph); graph= 0;
oqgraph::free(graph_share); graph_share= 0;