diff options
| author | unknown <kaa@polly.local> | 2007-04-28 20:04:03 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-04-28 20:04:03 +0400 |
| commit | 59a35c9afcdcf9dd9cd9f127dcd417ac7dc0e2c1 (patch) | |
| tree | c87d798baa97ec3d7f94149623cfb252e838756e /sql/item_strfunc.cc | |
| parent | 272563d81bfd3a736aaf7cabc5bd7e2587adbe47 (diff) | |
| parent | 38090df9b566da89942f8a90fe71a3fac31efb9d (diff) | |
| download | mariadb-git-59a35c9afcdcf9dd9cd9f127dcd417ac7dc0e2c1.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912
into polly.local:/home/kaa/src/maint/bug24912/my51-bug24912
mysql-test/r/type_newdecimal.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/r/func_math.result:
Manual merge.
sql/item_strfunc.cc:
Manual merge.
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index a011a2884c8..572ec972717 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1951,7 +1951,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)) |