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

MCOL-710 Fix ALTER TABLE ADD COLUMN for TEXT/BLOB

Browse Source 
The column fill didn't detect that this was a TEXT/BLOB column.
This commit is contained in:
Andrew Hutchings
2017-05-10 12:03:21 +01:00
parent f7e93798c6
commit cced9222e1
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
writeengine/wrapper/writeengine.cpp
View File

@ -535,14 +535,20 @@ int WriteEngineWrapper::fillColumn(const TxnID& txnid, const OID& dataOid,
//Bug 1703,1705 //Bug 1703,1705
bool isToken = false; bool isToken = false;
if (((dataType == CalpontSystemCatalog::VARCHAR) && (dataWidth > 7)) || if (((dataType == CalpontSystemCatalog::VARCHAR) && (dataWidth > 7)) ||
((dataType == CalpontSystemCatalog::CHAR) && (dataWidth > 8)) || (dataType == CalpontSystemCatalog::VARBINARY) ) ((dataType == CalpontSystemCatalog::CHAR) && (dataWidth > 8)) ||
(dataType == CalpontSystemCatalog::VARBINARY) ||
(dataType == CalpontSystemCatalog::BLOB) ||
(dataType == CalpontSystemCatalog::TEXT))
{ {
isToken = true; isToken = true;
} }
Convertor::convertColType(dataType, newColType, isToken); Convertor::convertColType(dataType, newColType, isToken);
if (((refColDataType == CalpontSystemCatalog::VARCHAR) && (refColWidth > 7)) || if (((refColDataType == CalpontSystemCatalog::VARCHAR) && (refColWidth > 7)) ||
((refColDataType == CalpontSystemCatalog::CHAR) && (refColWidth > 8)) || (refColDataType == CalpontSystemCatalog::VARBINARY)) ((refColDataType == CalpontSystemCatalog::CHAR) && (refColWidth > 8)) ||
(refColDataType == CalpontSystemCatalog::VARBINARY) ||
(dataType == CalpontSystemCatalog::BLOB) ||
(dataType == CalpontSystemCatalog::TEXT))
{ {
isToken = true; isToken = true;
} }