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

Merge branch 'develop-1.1' into 1.1-merge-up

Browse Source
This commit is contained in:
Andrew Hutchings
2017-12-12 20:26:00 +00:00
parent b795e6b781 ca2c511f59
commit 59d0a45da3
8 changed files with 146 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/rowgroup/rowgroup.cpp
View File

@ -701,6 +701,7 @@ void Row::initToNull()
case CalpontSystemCatalog::CHAR:
case CalpontSystemCatalog::VARCHAR:
case CalpontSystemCatalog::TEXT:
case CalpontSystemCatalog::STRINT:
{
if (inStringTable(i))
@ -744,6 +745,7 @@ void Row::initToNull()
}
case CalpontSystemCatalog::VARBINARY:
case CalpontSystemCatalog::BLOB:
*((uint16_t*) &data[offsets[i]]) = 0;
break;
@ -798,13 +800,6 @@ void Row::initToNull()
break;
}
case CalpontSystemCatalog::BLOB:
case CalpontSystemCatalog::TEXT:
{
memset(&data[offsets[i]], 0xFF, getColumnWidth(i));
break;
}
default:
ostringstream os;
os << "Row::initToNull(): got bad column type (" << types[i] <<