diff options
| author | Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com> | 2013-03-28 19:17:28 +0530 |
|---|---|---|
| committer | Nisha Gopalakrishnan <nisha.gopalakrishnan@oracle.com> | 2013-03-28 19:17:28 +0530 |
| commit | 65b3449391c9500320e8edd9d2bd6addeca32964 (patch) | |
| tree | 2f6ebcbb8c960b85c9947842503a478006530045 /sql/item.cc | |
| parent | 5c6611b5462ddd35c47b7c2c2b65e1edc090fd8d (diff) | |
| parent | 0de3047952e5c5d536a615d17bd4dd021d70363a (diff) | |
| download | mariadb-git-65b3449391c9500320e8edd9d2bd6addeca32964.tar.gz | |
Merge from 5.1 to 5.5
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 18831b83eae..ccef2b6321a 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -3370,7 +3370,9 @@ bool Item_param::convert_str_value(THD *thd) /* Here str_value is guaranteed to be in final_character_set_of_str_value */ max_length= str_value.numchars() * str_value.charset()->mbmaxlen; - decimals= 0; + + /* For the strings converted to numeric form within some functions */ + decimals= NOT_FIXED_DEC; /* str_value_ptr is returned from val_str(). It must be not alloced to prevent it's modification by val_str() invoker. |