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

Revert "MCOL-2243 Only set length and dec when dec is zero"

Browse Source 
This reverts commit b05c4e8df4.
This commit is contained in:
Andrew Hutchings
2019-07-11 13:32:44 +01:00
parent 23d6c34e3c
commit a627611378
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbcon/mysql/ha_calpont_impl.cpp
View File

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