diff options
| author | msvensson@pilot.blaudden <> | 2007-05-16 10:15:21 +0200 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-05-16 10:15:21 +0200 |
| commit | 19618b5375783d8e41724914e1a8a2167edced64 (patch) | |
| tree | 87b836ab026f0b095939d6bcfa636806df91b440 /sql | |
| parent | 1a2e798a70bc007572d20302fb35ac0d479ecb12 (diff) | |
| parent | 47d3829f0bac23b2e97b5cfc1c752d45ea72ba8a (diff) | |
| download | mariadb-git-19618b5375783d8e41724914e1a8a2167edced64.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 14a4c4dcf4b..adb512ec0e9 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1980,9 +1980,9 @@ double my_double_round(double value, longlong dec, bool dec_unsigned, tmp=(abs_dec < array_elements(log_10) ? log_10[abs_dec] : pow(10.0,(double) abs_dec)); - if (dec_negative && isinf(tmp)) + if (dec_negative && my_isinf(tmp)) tmp2= 0; - else if (!dec_negative && isinf(value * tmp)) + else if (!dec_negative && my_isinf(value * tmp)) tmp2= value; else if (truncate) { |