diff options
| author | monty@mysql.com <> | 2004-05-05 17:05:24 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-05 17:05:24 +0300 |
| commit | d21d49a32a1689d2c486a449574e120d7a2f60c4 (patch) | |
| tree | 3238bd16530e02dbfef96513749a73b7294880f8 /sql/item.cc | |
| parent | 104fdf607d312bb13f24063d28d993243bf24ca2 (diff) | |
| parent | e51887b05082622a1882217b7f8ec8ae7f6b4598 (diff) | |
| download | mariadb-git-d21d49a32a1689d2c486a449574e120d7a2f60c4.tar.gz | |
Merge with 4.0.19
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 3 |
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); |