mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-28 01:34:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-26691 SFORMAT: Pass down FLOAT as FLOAT, without upcast to DOUBLE

Browse source
This commit is contained in:
Sergei Golubchik 2021-10-09 15:35:22 +02:00
parent 284ed64336
commit 6a7c10de92
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/main/func_sformat.result
View file

@ -449,3 +449,9 @@ sformat("={:d}=", ?)
NULL NULL
Warnings: Warnings:
Warning 4183 SFORMAT error: invalid type specifier Warning 4183 SFORMAT error: invalid type specifier
#
# MDEV-26691 SFORMAT: Pass down FLOAT as FLOAT, without upcast to DOUBLE
#
select sformat('{}', cast(1.1 as float));
sformat('{}', cast(1.1 as float))
1.1

6
mysql-test/main/func_sformat.test
View file

@ -207,3 +207,9 @@ echo #;
prepare s from 'select sformat("={:d}=", ?)'; prepare s from 'select sformat("={:d}=", ?)';
execute s using 100; execute s using 100;
execute s using 'abc'; execute s using 'abc';
echo #;
echo # MDEV-26691 SFORMAT: Pass down FLOAT as FLOAT, without upcast to DOUBLE;
echo #;
select sformat('{}', cast(1.1 as float));

5
sql/item_strfunc.cc
View file

@ -1393,7 +1393,10 @@ String *Item_func_sformat::val_str(String *res)
break; break;
case DECIMAL_RESULT: // TODO case DECIMAL_RESULT: // TODO
case REAL_RESULT: case REAL_RESULT:
vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_real()); if (args[carg]->field_type() == MYSQL_TYPE_FLOAT)
vargs[carg-1]= fmt::detail::make_arg<ctx>((float)args[carg]->val_real());
else
vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_real());
break; break;
case STRING_RESULT: case STRING_RESULT:
if (!(parg= args[carg]->val_str(&val_arg[carg-1]))) if (!(parg= args[carg]->val_str(&val_arg[carg-1])))