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

MCOL-3561 This patch updates Connector code after MDEV-29988

Browse Source
This commit is contained in:
Roman Nozdrin
2022-12-23 10:57:10 +00:00
parent 5df48f6aa8
commit 5719c835b4
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbcon/mysql/ha_mcs_execplan.cpp
View File

@@ -3463,6 +3463,10 @@ ReturnedColumn* buildReturnedColumn(Item* item, gp_walk_info& gwi, bool& nonSupp
break; break;
default: default:
if (ref->ref_type() == Item_ref::DIRECT_REF)
{
return buildReturnedColumn(ref->real_item(), gwi, nonSupport);
}
gwi.fatalParseError = true; gwi.fatalParseError = true;
gwi.parseErrorText = "Unknown REF item"; gwi.parseErrorText = "Unknown REF item";
break; break;
@@ -6249,9 +6253,15 @@ void parse_item(Item* item, vector<Item_field*>& field_vec, bool& hasNonSupportI
case Item::REF_ITEM: case Item::REF_ITEM:
{ {
Item_ref* ref = (Item_ref*)item;
if (ref->ref_type() == Item_ref::DIRECT_REF)
{
parse_item(ref->real_item(), field_vec, hasNonSupportItem, parseInfo, gwi);
break;
}
while (true) while (true)
{ {
Item_ref* ref = (Item_ref*)item; ref = (Item_ref*)item;
if ((*(ref->ref))->type() == Item::SUM_FUNC_ITEM) if ((*(ref->ref))->type() == Item::SUM_FUNC_ITEM)
{ {
@@ -7665,7 +7675,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
break; break;
} }
default: default:
{ {
break; break;
} }