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-23

Browse Source
This commit is contained in:
Andrew Hutchings
2018-11-23 11:45:17 +00:00
parent 105f0ed4ad f6cf90fee7
commit 1834b64de8
3 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/funcexp/func_concat_ws.cpp
View File

@ -97,7 +97,7 @@ string Func_concat_ws::getStrVal(Row& row,
string tmp;
for ( uint32_t i = 1 ; i < parm.size() ; i++)
{
string(stringValue(parm[i], row, isNull).c_str(), tmp);
stringValue(parm[i], row, isNull, tmp);
str += tmp;
if (isNull)