diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 18:13:06 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-05-11 18:13:06 +0500 |
| commit | 78ed69c339965238c9047d0e41db6996c5a27d01 (patch) | |
| tree | b8c54abe0649f45196d32077f74dd9ff1d2ad872 /sql/item_func.h | |
| parent | 563b1297bbeef6f162513be314676d0d2c39b4a9 (diff) | |
| parent | a6da564a1d15925780f45d4bef439d4ae548f70d (diff) | |
| download | mariadb-git-78ed69c339965238c9047d0e41db6996c5a27d01.tar.gz | |
Merge mysql.com:/home/hf/work/27921/my50-27921
into mysql.com:/home/hf/work/27957/my50-27957
mysql-test/r/cast.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/my_decimal.h:
merging
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 0443e394585..7ec3c0b00c4 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -331,8 +331,8 @@ class Item_decimal_typecast :public Item_func public: Item_decimal_typecast(Item *a, int len, int dec) :Item_func(a) { - max_length= len + 2; decimals= dec; + max_length= my_decimal_precision_to_length(len, dec, unsigned_flag); } String *val_str(String *str); double val_real(); |