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' into MCOL-597

Browse Source
This commit is contained in:
Andrew Hutchings
2017-04-21 17:09:31 +01:00
parent c7f91d749b f240c89faf
commit f66a39ebfe
18 changed files with 82 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/dataconvert/dataconvert.cpp
View File

@ -1072,6 +1072,7 @@ boost::any
case CalpontSystemCatalog::CHAR:
case CalpontSystemCatalog::VARCHAR:
case CalpontSystemCatalog::TEXT:
{
//check data length
if ( data.length() > (unsigned int)colType.colWidth )
@ -1122,7 +1123,6 @@ boost::any
break;
case CalpontSystemCatalog::BLOB:
case CalpontSystemCatalog::TEXT:
case CalpontSystemCatalog::CLOB:
value = data;
break;
@ -1263,6 +1263,7 @@ boost::any
}
break;
case CalpontSystemCatalog::VARCHAR:
case CalpontSystemCatalog::TEXT:
{
std::string charnull;
if (colType.colWidth == 1 )
@ -1291,6 +1292,7 @@ boost::any
}
break;
case CalpontSystemCatalog::VARBINARY:
case CalpontSystemCatalog::BLOB:
{
WriteEngine::Token nullToken;
value = nullToken;