diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:19:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-10 19:19:05 +0200 |
| commit | 309c08c17c56d35e5635a5874fb70719935e5f54 (patch) | |
| tree | db63b0f496364456789f390eb5f693dabf0f94a1 /sql/item_sum.cc | |
| parent | c6fdb92ca829fed893d9e7324e80b1450de16087 (diff) | |
| parent | 5ad02062d928cccbd29c0a2db6f0f7ceb33195d1 (diff) | |
| download | mariadb-git-309c08c17c56d35e5635a5874fb70719935e5f54.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index e9f52a8c27b..d1ab102c709 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1479,7 +1479,7 @@ my_decimal *Item_sum_sum::val_decimal(my_decimal *val) if (aggr) aggr->endup(); if (hybrid_type == DECIMAL_RESULT) - return (dec_buffs + curr_dec_buff); + return null_value ? NULL : (dec_buffs + curr_dec_buff); return val_decimal_from_real(val); } @@ -1779,6 +1779,8 @@ double Item_sum_std::val_real() { DBUG_ASSERT(fixed == 1); double nr= Item_sum_variance::val_real(); + if (my_isinf(nr)) + return DBL_MAX; DBUG_ASSERT(nr >= 0.0); return sqrt(nr); } |