diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-10-24 11:50:09 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-10-24 11:50:09 +0300 |
| commit | a63f873e52a84c28e211d81294296abdafae7307 (patch) | |
| tree | 4acc70703363e4a6f03dc72000fe43ee6428288f /sql/item.cc | |
| parent | 611a8972b8e36373cbc642dee881131de0c4dfd7 (diff) | |
| parent | 911dd5b564dba03746ba6f50463d1627f6db661c (diff) | |
| download | mariadb-git-a63f873e52a84c28e211d81294296abdafae7307.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.1-opt
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/item.cc:
Auto merged
sql/opt_sum.cc:
merge bug 30715 to 5.1-opt
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 95c8cd582cd..565081a600a 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4649,7 +4649,7 @@ int Item::save_in_field(Field *field, bool no_conversions) my_decimal decimal_value; my_decimal *value= val_decimal(&decimal_value); if (null_value) - return set_field_to_null(field); + return set_field_to_null_with_conversions(field, no_conversions); field->set_notnull(); error=field->store_decimal(value); } |