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

Remove a curly brace and add a check in a for loop in create_columnstore_select_handler()

Browse Source
This commit is contained in:
Gagan Goel
2019-08-28 19:29:12 -04:00
parent 0602a57c61
commit 92ee66f5fd
2 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -5365,7 +5365,6 @@ int ha_cs_impl_select_next(uchar* buf, TABLE* table)
}
ci->tableMap[table] = ti;
hndl->queryState= sm::QUERY_IN_PROCESS;
}
if (!ti.tpl_ctx || !ti.tpl_scan_ctx)
{

5
dbcon/mysql/ha_mcs_pushdown.cpp
View File

@ -415,7 +415,7 @@ create_columnstore_derived_handler(THD* thd, TABLE_LIST *derived)
//G(V,E) where [V] = [E]+1
List<Item> join_preds_list;
TABLE_LIST *tl;
for (tl= sl->get_table_list(); tl; tl= tl->next_local)
for (tl = sl->get_table_list(); !unsupported_feature && tl; tl = tl->next_local)
{
Item_cond* where_icp= 0;
Item_cond* on_icp= 0;
@ -442,7 +442,8 @@ create_columnstore_derived_handler(THD* thd, TABLE_LIST *derived)
// CROSS JOIN w/o conditions isn't supported until MCOL-301
// is ready.
if (join && join->table_count >= 2 && !join_preds_list.elements)
if (!unsupported_feature && join
&& join->table_count >= 2 && !join_preds_list.elements)
{
unsupported_feature= true;
}