diff options
| author | unknown <kaa@polly.local> | 2007-04-28 20:26:14 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2007-04-28 20:26:14 +0400 |
| commit | ac86892f72acc407a6e0fff7af2bd8e7d2c750c4 (patch) | |
| tree | 49453d89159d8dbdffe5b970dc54cf197c85ca9f /sql/item_strfunc.cc | |
| parent | fef06223af7779bcafb2c37977c1ffb525ea7bd8 (diff) | |
| parent | 38090df9b566da89942f8a90fe71a3fac31efb9d (diff) | |
| download | mariadb-git-ac86892f72acc407a6e0fff7af2bd8e7d2c750c4.tar.gz | |
Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912
into polly.local:/home/kaa/src/maint/mysql-5.0-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
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 1991526345c..f9a0f715985 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1995,7 +1995,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, decimals, FALSE); + nr= my_double_round(nr, (longlong) decimals, FALSE, FALSE); /* Here default_charset() is right as this is not an automatic conversion */ str->set(nr,decimals, default_charset()); if (isnan(nr)) |