summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2004-04-13 00:13:25 +0400
committerunknown <sergefp@mysql.com>2004-04-13 00:13:25 +0400
commit8033292dbb171c66281146c5f011e55282e3746c (patch)
treeef8312c4bbaeed6ff1030987848a4b001d223213 /sql/item.cc
parent0ba6cb48d84f1ff951d09871a96be6cdef3f2c3c (diff)
downloadmariadb-git-8033292dbb171c66281146c5f011e55282e3746c.tar.gz
Fix and testcase for BUG#3367.
sql/sql_prepare.cc: value_is_set should be true for NULL value, as for non-NULL values.
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 2584c1cafb3..72583ea02bb 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -745,6 +745,8 @@ longlong Item_param::val_int()
String *Item_param::val_str(String* str)
{
DBUG_ASSERT(value_is_set == 1);
+ if (null_value)
+ return NULL;
switch (item_result_type) {
case INT_RESULT:
str->set(int_value, &my_charset_bin);