diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-06-02 12:00:37 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-06-02 12:00:37 +0500 |
| commit | 9800aa29e3308f43682ec3469b5e783883fd589b (patch) | |
| tree | b8b717274fcaa61b9c8b0968f2a1d0656b2f630e /sql | |
| parent | 13f7a81b3781c7e5496874641d35e5b20ff81635 (diff) | |
| parent | 83ec6e05926e28a17a3576fa99545f79f5ce8a8c (diff) | |
| download | mariadb-git-9800aa29e3308f43682ec3469b5e783883fd589b.tar.gz | |
5.0-bugteam->5.1-bugteam merge
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 85e5de7b980..4cc3c609c0e 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1944,8 +1944,8 @@ void Item_func_round::fix_length_and_dec() unsigned_flag= args[0]->unsigned_flag; if (!args[1]->const_item()) { - max_length= args[0]->max_length; decimals= args[0]->decimals; + max_length= float_length(decimals); if (args[0]->result_type() == DECIMAL_RESULT) { max_length++; @@ -1965,8 +1965,8 @@ void Item_func_round::fix_length_and_dec() if (args[0]->decimals == NOT_FIXED_DEC) { - max_length= args[0]->max_length; decimals= min(decimals_to_set, NOT_FIXED_DEC); + max_length= float_length(decimals); hybrid_type= REAL_RESULT; return; } |