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 pull request #1003 from mariadb-corporation/fix-doUpdateDelete

Browse Source 
This commit fixes MDB crash that happens when table lock timeout fires
This commit is contained in:
Andrew Hutchings
2020-01-17 08:25:44 -08:00
committed by GitHub
parent f21998eff3 f178f2c22f
commit cd80b0ace5
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/mysql/ha_mcs_impl.cpp
View File

@ -2206,9 +2206,7 @@ uint32_t doUpdateDelete(THD* thd, gp_walk_info& gwi)
//@Bug 2540. Set error status instead of warning //@Bug 2540. Set error status instead of warning
thd->raise_error_printf(ER_INTERNAL_ERROR, errorMsg.c_str()); thd->raise_error_printf(ER_INTERNAL_ERROR, errorMsg.c_str());
ci->rc = b; ci->rc = b;
// WIP rc = ER_INTERNAL_ERROR;
//thd->get_stmt_da()->set_overwrite_status(true);
//cout << " error status " << ci->rc << endl;
} }
if (b == dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING) if (b == dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING)
@ -2249,7 +2247,7 @@ uint32_t doUpdateDelete(THD* thd, gp_walk_info& gwi)
delete ci->dmlProc; delete ci->dmlProc;
ci->dmlProc = NULL; ci->dmlProc = NULL;
return 0; return rc;
} }
} //anon namespace } //anon namespace