summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2004-09-25 18:37:28 +0300
committerbell@sanja.is.com.ua <>2004-09-25 18:37:28 +0300
commit6df58cc97e6aecd341b8dfcb82b696fd5123f90a (patch)
tree1328afc6e2b10d48dd499927063824ec875201a9 /sql/item.cc
parentcd32040889b9bc9f6437588a3a8bf3878c021b1b (diff)
parentef7bdbf4b8efd5d1d293e801939937a26fef6292 (diff)
downloadmariadb-git-6df58cc97e6aecd341b8dfcb82b696fd5123f90a.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
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 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);