From 04807c3ef84e195ab6f2060e92288d68062f9ff8 Mon Sep 17 00:00:00 2001
From: Patrick LeBlanc <patrick.leblanc@mariadb.com>
Date: Wed, 8 Jan 2020 16:05:22 -0500
Subject: [PATCH] MCOL-3713: Join abort problem

Noticed a race on djsJoiners in abort() and segregateJoiners().
Re-added the mutex lock, but after risk of double lock grab.
---
 dbcon/joblist/tuplehashjoin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dbcon/joblist/tuplehashjoin.cpp b/dbcon/joblist/tuplehashjoin.cpp
index a7b3bc720..53f4a8ba1 100644
--- a/dbcon/joblist/tuplehashjoin.cpp
+++ b/dbcon/joblist/tuplehashjoin.cpp
@@ -1938,6 +1938,7 @@ void TupleHashJoinStep::segregateJoiners()
     }
     #endif
 
+    boost::mutex::scoped_lock sl(djsLock);
     /* For now if there is no largeBPS all joins need to either be DJS or not, not mixed */
     if (!largeBPS)
     {