database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +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/functor_str.h
View File

@ -100,7 +100,7 @@ public:
}
protected:
const std::string& stringValue(execplan::SPTP& fp, rowgroup::Row& row, bool& isNull)
const void stringValue(execplan::SPTP& fp, rowgroup::Row& row, bool& isNull, std::string& fFloatStr)
{
// Bug3788, use the shorter of fixed or scientific notation for floating point values.
// [ the default format in treenode.h is fixed-point notation ]
@ -120,7 +120,8 @@ protected:
break;
default:
return fp->data()->getStrVal(row, isNull);
fFloatStr = fp->data()->getStrVal(row, isNull);
return;
break;
}
@ -140,10 +141,7 @@ protected:
fFloatStr += buf;
}
return fFloatStr;
}
std::string fFloatStr;
};