diff options
| author | kaa@polly.local <> | 2007-04-28 20:08:58 +0400 |
|---|---|---|
| committer | kaa@polly.local <> | 2007-04-28 20:08:58 +0400 |
| commit | 83e8b709834063f1065a4e18374425140feb0833 (patch) | |
| tree | bde7852f6352f14583b5c36df3e0aeaf29e1b85b /sql/item_strfunc.cc | |
| parent | 65dbbb9fb018f1aa9c6f482f761573c44c25f083 (diff) | |
| parent | a45b654ed7e98aaf5eab6b999745c1584af10e9b (diff) | |
| download | mariadb-git-83e8b709834063f1065a4e18374425140feb0833.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug24912/my51-bug24912
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
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 4e28967b2b0..a1fd79cbfb0 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -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)) |