database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge branch 'develop-1.1' into 1.2-merge-up-20190111

Browse Source
This commit is contained in:
Andrew Hutchings
2019-01-11 20:16:38 +00:00
parent 6172e60896 63824fa1c2
commit ab74bec10b
4 changed files with 100 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/cleartablelock/cleartablelock.cpp
View File

@ -650,6 +650,11 @@ int main(int argc, char** argv)
rc = execBulkRollbackReq( msgQueClts, pmList,
&brm, tInfo, tblName.toString(), rollbackOnly, errMsg );
BRM::TxnID txn;
txn.id = tInfo.ownerTxnID;
txn.valid = true;
brm.rolledback(txn);
if (rc != 0)
{
logFinalStatus( tblName.toString(), lockID, errMsg );