Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

into mysql.com:/home/hf/work/mrg/mysql-5.0-opt

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2b1179ad · holyfoot/hf@mysql.com/hfmain.(none) · 60e0dcea · 35e59256 · 2b1179ad
Commit 2b1179ad authored Mar 09, 2007 by holyfoot/hf@mysql.com/hfmain.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_select.cc sql/sql_select.cc +2 -1

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -7621,7 +7621,8 @@ static COND* substitute_for_best_equal_field(COND *cond,
          break;
      }
    }
-    if (!((Item_cond*)cond)->argument_list()->elements)
+    if (cond->type() == Item::COND_ITEM &&
+        !((Item_cond*)cond)->argument_list()->elements)
      cond= new Item_int((int32)cond->val_bool());
  }