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 | c936b6444a773a2ff9d7b8b67b27bc852acf31da (patch) | |
tree | 06e2ea011ccd6c53fc3aca4b2248b33e484509e3 /sql/item_func.h | |
parent | 0ecf826a863891312c9b3aa84ccc9a7b781a795a (diff) | |
parent | 4692566f9e2125984b511ee5ec30c85a1357872b (diff) | |
download | mariadb-git-c936b6444a773a2ff9d7b8b67b27bc852acf31da.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(); |