mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge polly.local:/home/kaa/src/maint/bug24912/my51-bug24912

Browse source 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint


sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
This commit is contained in:
unknown 2007-04-28 20:08:58 +04:00
commit 46ca37d270
7 changed files with 207 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item_strfunc.cc
View file

@ -2028,7 +2028,7 @@ String *Item_func_format::val_str(String *str)
double nr= args[0]->val_real();
if ((null_value=args[0]->null_value))
return 0; /* purecov: inspected */
nr= my_double_round(nr, dec, FALSE);
nr= my_double_round(nr, (longlong) dec, FALSE, FALSE);
/* Here default_charset() is right as this is not an automatic conversion */
str->set_real(nr, dec, default_charset());
if (isnan(nr))