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 develop-1.2-merge-up-20190619

This commit is contained in:
Andrew Hutchings
2019-06-19 18:34:43 +01:00
6 changed files with 40 additions and 18 deletions

View File

@ -649,7 +649,11 @@ int fetchNextRow(uchar* buf, cal_table_info& ti, cal_connection_info* ci, bool h
// bug 3485, reserve enough space for the longest float value
// -3.402823466E+38 to -1.175494351E-38, 0, and
// 1.175494351E-38 to 3.402823466E+38.
(*f)->field_length = 40;
if (!f2->dec)
{
(*f)->field_length = 40;
f2->dec = row.getScale(s);
}
//float float_val = *(float*)(&value);
//f2->store(float_val);
@ -679,7 +683,11 @@ int fetchNextRow(uchar* buf, cal_table_info& ti, cal_connection_info* ci, bool h
// bug 3483, reserve enough space for the longest double value
// -1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and
// 2.2250738585072014E-308 to 1.7976931348623157E+308.
(*f)->field_length = 310;
if (!f2->dec)
{
(*f)->field_length = 310;
f2->dec = row.getScale(s);
}
//double double_val = *(double*)(&value);
//f2->store(double_val);