diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-07-03 14:36:04 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-07-03 14:36:04 +0400 |
| commit | 2d4df13ef28f4d5f0fbb67d570bfce9c1ebe1881 (patch) | |
| tree | 06e2ea011ccd6c53fc3aca4b2248b33e484509e3 /sql/item_cmpfunc.cc | |
| parent | e2ac8c07bdd2e58f5f7b4919a76a0d1881f3ed5e (diff) | |
| parent | 096c12b2c42b83d879314276fe6471edf8c61fd0 (diff) | |
| download | mariadb-git-2d4df13ef28f4d5f0fbb67d570bfce9c1ebe1881.tar.gz | |
Manual merge.
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 6f3bdd18ba5..1ff9ca6a419 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2760,8 +2760,9 @@ void Item_func_case::fix_length_and_dec() agg_num_lengths(args[i + 1]); if (else_expr_num != -1) agg_num_lengths(args[else_expr_num]); - max_length= my_decimal_precision_to_length(max_length + decimals, decimals, - unsigned_flag); + max_length= my_decimal_precision_to_length_no_truncation(max_length + + decimals, decimals, + unsigned_flag); } } |