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

Merge branch 'develop-1.1' into 1.1-merge-up-2018-11-08

Browse Source
This commit is contained in:
Andrew Hutchings
2018-11-08 18:39:44 +00:00
parent c452882a79 91a24e410f
commit 85121060fb
8 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utils/funcexp/func_concat.cpp
View File

@ -55,11 +55,14 @@ string Func_concat::getStrVal(Row& row,
bool& isNull,
CalpontSystemCatalog::ColType&)
{
string ret = stringValue(parm[0], row, isNull);
string ret;
string tmp;
stringValue(parm[0], row, isNull, ret);
for ( unsigned int id = 1 ; id < parm.size() ; id++)
{
ret.append( stringValue(parm[id], row, isNull) );
stringValue(parm[id], row, isNull, tmp);
ret.append(tmp);
}
return ret;