1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00

MCOL-859 DDL System catalog mutex deadlock

A race between a DDL change and a system catalog version cache update
can cause a deadlock in DDLProc. This makes the mutex recursive.
This commit is contained in:
Andrew Hutchings
2017-09-15 10:05:19 +01:00
committed by David Hall
parent 54cc870b82
commit 8ca85fbb40
2 changed files with 4 additions and 3 deletions

View File

@ -871,7 +871,8 @@ private:
typedef std::map<OID, OID> DctTokenMap;
DctTokenMap fDctTokenMap;
boost::mutex fDctTokenMapLock;
// MCOL-859: this can lock when already locked in the same thread
boost::recursive_mutex fDctTokenMapLock;
typedef std::map<OID, TableName> TableNameMap;
TableNameMap fTableNameMap;