database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-02 17:22:27 +03:00
Code Activity

This commit fixes MDB crash that happens when table lock timeout fires

Browse Source 
with multiply DML run in separate transactions.

This commit also fixes GCC unused variable warning.
This commit is contained in:
Roman Nozdrin
2020-01-14 22:44:35 +00:00
committed by root
parent 4578595a6e
commit f178f2c22f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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
thd->raise_error_printf(ER_INTERNAL_ERROR, errorMsg.c_str());
ci->rc = b;
// WIP
//thd->get_stmt_da()->set_overwrite_status(true);
//cout << " error status " << ci->rc << endl;
rc = ER_INTERNAL_ERROR;
}
if (b == dmlpackageprocessor::DMLPackageProcessor::IDBRANGE_WARNING)
@ -2249,7 +2247,7 @@ uint32_t doUpdateDelete(THD* thd, gp_walk_info& gwi)
delete ci->dmlProc;
ci->dmlProc = NULL;
return 0;
return rc;
}
} //anon namespace
@ -2303,7 +2301,7 @@ int ha_mcs_impl_direct_update_delete_rows(bool execute, ha_rows *affected_rows)
*affected_rows = ci->affectedRows;
}
return 0;
return rc;
}
int ha_mcs_impl_rnd_init(TABLE* table)