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

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

This commit is contained in:
Andrew Hutchings
2018-11-08 18:39:44 +00:00
8 changed files with 28 additions and 20 deletions

View File

@ -100,7 +100,9 @@ string Func_elt::getStrVal(rowgroup::Row& row,
return "";
}
return stringValue(parm[number], row, isNull);
std::string ret;
stringValue(parm[number], row, isNull, ret);
return ret;
}