From 5f1b9717c53f19ef4f7a5206f59a7678a025dbe2 Mon Sep 17 00:00:00 2001
From: unknown <monty@mashka.mysql.fi>
Date: Sat, 21 Dec 2002 10:45:06 +0200
Subject: Optimization of CASE bug fix

---
 sql/item_cmpfunc.cc | 5 ++---
 1 file 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;
 }
 
-- 
cgit v1.2.1