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

8
utils/funcexp/func_insert.cpp
View File

@ -88,13 +88,13 @@ std::string Func_insert::getStrVal(rowgroup::Row& row,
bool& isNull,
execplan::CalpontSystemCatalog::ColType&)
{
const string& tstr = stringValue(fp[0], row, isNull);
string tstr;
stringValue(fp[0], row, isNull, tstr);
if (isNull)
return "";
const string& tnewstr = stringValue(fp[3], row, isNull);
string tnewstr;
stringValue(fp[3], row, isNull, tnewstr);
if (isNull)
return "";