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

13
utils/funcexp/func_concat_ws.cpp
View File

@ -49,8 +49,8 @@ string Func_concat_ws::getStrVal(Row& row,
bool& isNull,
CalpontSystemCatalog::ColType&)
{
string delim = stringValue(parm[0], row, isNull);
string delim;
stringValue(parm[0], row, isNull, delim);
if (isNull)
return "";
@ -63,8 +63,8 @@ string Func_concat_ws::getStrVal(Row& row,
for ( unsigned int id = 1 ; id < parm.size() ; id++)
{
string tstr = stringValue(parm[id], row, isNull);
string tstr;
stringValue(parm[id], row, isNull, tstr);
if (isNull)
{
isNull = false;
@ -94,10 +94,11 @@ string Func_concat_ws::getStrVal(Row& row,
#else
string str;
string tmp;
for ( uint32_t i = 1 ; i < parm.size() ; i++)
{
str += string(stringValue(parm[i], row, isNull).c_str());
string(stringValue(parm[i], row, isNull).c_str(), tmp);
str += tmp;
if (isNull)
{