diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 21:03:01 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-16 21:03:01 +0100 |
| commit | 5d0c01608c74b09fea8c6110213160b049487a4c (patch) | |
| tree | 924e11e71f586c97a20f43d66183393ea1f48504 /sql/item.cc | |
| parent | cfc83cf9d3c3354d47f9e7ee903ea279f60cce58 (diff) | |
| parent | e772cbd7b774add42821c33b13ea052f8c9e2e6e (diff) | |
| download | mariadb-git-5d0c01608c74b09fea8c6110213160b049487a4c.tar.gz | |
5.2 merge
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/item.cc b/sql/item.cc index 88489a343fb..58b2d164509 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2012, Oracle and/or its affiliates. + Copyright (c) 2000, 2013, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -504,7 +504,7 @@ Item::Item(THD *thd, Item *item): with_field(item->with_field), fixed(item->fixed), is_autogenerated_name(item->is_autogenerated_name), - with_subselect(item->with_subselect), + with_subselect(item->has_subquery()), collation(item->collation), cmp_context(item->cmp_context) { @@ -3550,7 +3550,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. |