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

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
This commit is contained in:
holyfoot/hf@hfmain.(none) 2007-03-09 13:50:06 +04:00
commit bcc5499bab

View file

@ -7788,7 +7788,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());
}