summaryrefslogtreecommitdiff
path: root/sql/item_cmpfunc.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-12-21 10:45:06 +0200
committermonty@mashka.mysql.fi <>2002-12-21 10:45:06 +0200
commit962042e76d8529fb24abb0808f37247f3448f69a (patch)
tree94452628cf4dda213363cf02d5acc3a5ae3356fb /sql/item_cmpfunc.cc
parent5d60d8e5cbb0f864f055eeedd2e41e8d8ceb493a (diff)
downloadmariadb-git-962042e76d8529fb24abb0808f37247f3448f69a.tar.gz
Optimization of CASE bug fix
Diffstat (limited to 'sql/item_cmpfunc.cc')
-rw-r--r--sql/item_cmpfunc.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 0d10b17ad87..c3381eb76ea 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -685,10 +685,9 @@ String *Item_func_case::val_str(String *str)
null_value=1;
return 0;
}
+ null_value= 0;
if (!(res=item->val_str(str)))
- null_value=1;
- else
- null_value=item->null_value;
+ null_value= 1;
return res;
}