diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-25 18:37:28 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-25 18:37:28 +0300 |
| commit | 408b5ca5740fbbc41e67f7792969dcf19763547b (patch) | |
| tree | 1328afc6e2b10d48dd499927063824ec875201a9 /sql/item.cc | |
| parent | 40c12fa8c6b989d16a45013500df1ca612fa96a3 (diff) | |
| parent | cd1cd0df7251fed6613a70c04b2bfbec9896af25 (diff) | |
| download | mariadb-git-408b5ca5740fbbc41e67f7792969dcf19763547b.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
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 ea095df3aaa..4226f58e9a6 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -891,7 +891,7 @@ int Item_param::save_in_field(Field *field, bool no_conversions) return field->store(str_value.ptr(), str_value.length(), str_value.charset()); case NULL_VALUE: - return set_field_to_null(field); + return set_field_to_null_with_conversions(field, no_conversions); case NO_VALUE: default: DBUG_ASSERT(0); |