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_func.h | |
| parent | e2ac8c07bdd2e58f5f7b4919a76a0d1881f3ed5e (diff) | |
| parent | 096c12b2c42b83d879314276fe6471edf8c61fd0 (diff) | |
| download | mariadb-git-2d4df13ef28f4d5f0fbb67d570bfce9c1ebe1881.tar.gz | |
Manual merge.
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 67049af81a2..514f93a39ea 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -378,7 +378,8 @@ public: Item_decimal_typecast(Item *a, int len, int dec) :Item_func(a) { decimals= dec; - max_length= my_decimal_precision_to_length(len, dec, unsigned_flag); + max_length= my_decimal_precision_to_length_no_truncation(len, dec, + unsigned_flag); } String *val_str(String *str); double val_real(); |