summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc
index e1cdfcf42c0..98e6f02efad 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1354,7 +1354,10 @@ int Item::save_in_field(Field *field, bool no_conversions)
str_value.set_quick(buff, sizeof(buff), cs);
result=val_str(&str_value);
if (null_value)
+ {
+ str_value.set_quick(0, 0);
return set_field_to_null_with_conversions(field, no_conversions);
+ }
field->set_notnull();
error=field->store(result->ptr(),result->length(),cs);
str_value.set_quick(0, 0, cs);