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-1.2' into develop-merge-up-20190729

Browse Source
This commit is contained in:
Andrew Hutchings
2019-07-29 12:19:26 +01:00
parent d30745d37c 106250cbf0
commit 811909aa72
36 changed files with 366 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/rowgroup/rowgroup.h
View File

@ -1771,7 +1771,8 @@ inline void copyRow(const Row& in, Row* out, uint32_t colCount)
{
if (UNLIKELY(in.getColTypes()[i] == execplan::CalpontSystemCatalog::VARBINARY ||
in.getColTypes()[i] == execplan::CalpontSystemCatalog::BLOB ||
in.getColTypes()[i] == execplan::CalpontSystemCatalog::TEXT))
in.getColTypes()[i] == execplan::CalpontSystemCatalog::TEXT ||
in.getColTypes()[i] == execplan::CalpontSystemCatalog::CLOB))
out->setVarBinaryField(in.getVarBinaryStringField(i), i);
else if (UNLIKELY(in.isLongString(i)))
//out->setStringField(in.getStringField(i), i);