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

Updates to plugin code based on recent changes in the server 10.5 branch.

Browse Source
This commit is contained in:
Gagan Goel
2020-03-12 00:42:16 +00:00
parent f01185f991
commit 457ec0d483
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbcon/mysql/ha_mcs_execplan.cpp
View File

@ -2382,7 +2382,7 @@ SimpleColumn* buildSimpleColFromDerivedTable(gp_walk_info& gwi, Item_field* ifp)
sc->oid(oidlist[j].objnum);
// @bug 3003. Keep column alias if it has.
sc->alias(ifp->is_autogenerated_name ? tcn.column : ifp->name.str);
sc->alias(ifp->is_autogenerated_name() ? tcn.column : ifp->name.str);
sc->tableAlias(lower(gwi.tbList[i].alias));
sc->viewName(lower(viewName));
@ -2440,7 +2440,7 @@ SimpleColumn* buildSimpleColFromDerivedTable(gp_walk_info& gwi, Item_field* ifp)
sc->columnName(col->columnName());
// @bug 3003. Keep column alias if it has.
sc->alias(ifp->is_autogenerated_name ? cols[j]->alias() : ifp->name.str);
sc->alias(ifp->is_autogenerated_name() ? cols[j]->alias() : ifp->name.str);
sc->tableName(csep->derivedTbAlias());
sc->colPosition(j);
string tableAlias(csep->derivedTbAlias());
@ -6677,7 +6677,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
ifp->print(&str, QT_ORDINARY);
fullname = str.c_ptr();
if (ifp->is_autogenerated_name) // no alias
if (ifp->is_autogenerated_name()) // no alias
{
sc->alias(fullname);
}
@ -7281,7 +7281,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
gwi.groupByCols.push_back(srcp);
continue;
}
else if (!groupItem->is_autogenerated_name) // alias
else if (!groupItem->is_autogenerated_name()) // alias
{
uint32_t i = 0;
@ -8690,7 +8690,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
ifp->print(&str, QT_ORDINARY);
fullname = str.c_ptr();
if (ifp->is_autogenerated_name) // no alias
if (ifp->is_autogenerated_name()) // no alias
{
sc->alias(fullname);
}
@ -9288,7 +9288,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
gwi.groupByCols.push_back(srcp);
continue;
}
else if (!groupItem->is_autogenerated_name) // alias
else if (!groupItem->is_autogenerated_name()) // alias
{
uint32_t i = 0;