summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2007-10-23 19:24:59 +0400
committerunknown <sergefp@mysql.com>2007-10-23 19:24:59 +0400
commit53dac1ee1a31ea745feb35802207dae5e92dea1c (patch)
treedc483fb46f4b69af8a0c54a172d5928caa2730b9 /sql/item.cc
parentc448d2ed5d2a7efd1f77b956f46d8f1e48b17350 (diff)
downloadmariadb-git-53dac1ee1a31ea745feb35802207dae5e92dea1c.tar.gz
BUG#31450: Query causes error 1048
- Let Item::save_in_field() call set_field_to_null_with_conversions() for decimal type, like this is done for the other item result types. mysql-test/r/type_decimal.result: BUG#31450: Query causes error 1048: testcase mysql-test/t/type_decimal.test: BUG#31450: Query causes error 1048: testcase
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 83cbf261b8a..739fe7967e2 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -4548,7 +4548,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);
}