database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop' into MCOL-4126

Browse Source
This commit is contained in:
David Hall
2020-06-30 11:25:11 -05:00
parent 8179ffffdf 60ef3e5130
commit 085b06d422
113 changed files with 417 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
dbcon/mysql/ha_mcs_impl.cpp
View File

@ -1604,27 +1604,7 @@ uint32_t doUpdateDelete(THD* thd, gp_walk_info& gwi, const std::vector<COND*>& c
aTableName.schema = first_table->table->s->db.str;
aTableName.table = first_table->table->s->table_name.str;
}
#if 0
CalpontSystemCatalog::ROPair roPair;
try
{
roPair = csc->tableRID( aTableName );
}
catch (IDBExcept& ie)
{
setError(thd, ER_INTERNAL_ERROR, ie.what());
return ER_INTERNAL_ERROR;
}
catch (std::exception& ex)
{
setError(thd, ER_INTERNAL_ERROR,
logging::IDBErrorInfo::instance()->errorMsg(ERR_SYSTEM_CATALOG) + ex.what());
return ER_INTERNAL_ERROR;
}
ci->tableOid = roPair.objnum;
#endif
CalpontDMLPackage* pDMLPackage = 0;
// dmlStmt += ";";
IDEBUG( cout << "STMT: " << dmlStmt << " and sessionID " << thd->thread_id << endl );
@ -2271,7 +2251,6 @@ uint32_t doUpdateDelete(THD* thd, gp_walk_info& gwi, const std::vector<COND*>& c
delete ci->dmlProc;
ci->dmlProc = nullptr;
return rc;
}