database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

MCOL-267 Minor fixups

Browse Source 
Fix things found by David Hall
This commit is contained in:
Andrew Hutchings
2017-03-23 17:14:00 +00:00
parent b7a01ce02e
commit 530cc94915
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/joblist/crossenginestep.cpp
View File

@@ -235,8 +235,8 @@ void CrossEngineStep::setField(int i, const char* value, unsigned long length, R
{
CalpontSystemCatalog::ColDataType colType = row.getColType(i);
if (((colType == CalpontSystemCatalog::CHAR || colType == CalpontSystemCatalog::VARCHAR) &&
row.getColumnWidth(i) > 8))
if ((colType == CalpontSystemCatalog::CHAR || colType == CalpontSystemCatalog::VARCHAR) &&
row.getColumnWidth(i) > 8)
{
if (value != NULL)
row.setStringField(value, i);

5
primitives/linux-port/dictionary.cpp
View File

@@ -425,6 +425,11 @@ again:
// is larger than the number of signatures in this block. Return a "special" string so that
// the query keeps going, but that can be recognized as an internal error upon inspection.
//@Bug 2534. Change the length check to 8000
// MCOL-267:
// With BLOB support we have had to increase this to 8176
// because a BLOB can take 8176 bytes of a dictionary block
// instead of the fixed 8000 with CHAR/VARCHAR
if (ret->len < 0 || ret->len > 8176)
{
ret->data = reinterpret_cast<const uint8_t*>(signatureNotFound);