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; }