database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Merge branch 'develop' into MCOL-4841

Browse Source 
# Conflicts:
#	exemgr/main.cpp
#	oam/etc/Columnstore.xml.singleserver
#	primitives/primproc/primproc.cpp
This commit is contained in:
david.hall
2022-06-09 10:07:26 -05:00
parent a98834e31c 2ad4ae2cd2
commit 3b6449842f
523 changed files with 32140 additions and 8380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dbcon/joblist/groupconcat.cpp
View File

@ -373,7 +373,15 @@ void GroupConcatAgUM::applyMapping(const boost::shared_array<int>& mapping, cons
}
else
{
fRow.setIntField(row.getIntField(mapping[i]), i);
if (fRow.getColTypes()[i] == execplan::CalpontSystemCatalog::CHAR ||
fRow.getColTypes()[i] == execplan::CalpontSystemCatalog::VARCHAR)
{
fRow.setIntField(row.getUintField(mapping[i]), i);
}
else
{
fRow.setIntField(row.getIntField(mapping[i]), i);
}
}
}
}
@ -1050,4 +1058,3 @@ const string GroupConcatNoOrder::toString() const
}
} // namespace joblist
// vim:ts=4 sw=4: