Merge mashka.mysql.fi:/home/my/mysql-3.23

into mashka.mysql.fi:/home/my/mysql-4.0

1 files changed, 10 insertions, 8 deletions

diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index aaa15f415e7..5efda9ce88c 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -465,17 +465,19 @@ public:
   void update_used_tables()
   {
     if (!args[0]->maybe_null)
-      used_tables_cache=0;			/* is always false */
-    else
     {
-      args[0]->update_used_tables();
-      used_tables_cache=args[0]->used_tables();
+      used_tables_cache= 0;			/* is always false */
+      cached_value= (longlong) 0;
     }
-    if (!used_tables_cache)
+    else
     {
-      /* Remember if the value is always NULL or never NULL */
-      args[0]->val();
-      cached_value= args[0]->null_value ? (longlong) 1 : (longlong) 0;
+      args[0]->update_used_tables();
+      if (!(used_tables_cache=args[0]->used_tables()))
+      {
+	/* Remember if the value is always NULL or never NULL */
+	args[0]->val();
+	cached_value= args[0]->null_value ? (longlong) 1 : (longlong) 0;
+      }
     }
   }
   optimize_type select_optimize() const { return OPTIMIZE_NULL; }