summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-07-03 14:36:04 +0400
committerAlexey Kopytov <Alexey.Kopytov@Sun.com>2009-07-03 14:36:04 +0400
commit6dd73034604d307fd5d5248fa822aa9076f379b8 (patch)
tree06e2ea011ccd6c53fc3aca4b2248b33e484509e3 /sql/item_func.h
parentc9538baff76b2cd98927f0ba945a3702447b3167 (diff)
parentdd7fa1d2280b45d13765577b74b2f394a6ee62dd (diff)
downloadmariadb-git-6dd73034604d307fd5d5248fa822aa9076f379b8.tar.gz
Manual merge.
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h3
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();