Commit 84ceb01e authored by unknown's avatar unknown
Browse files

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

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


sql/sql_select.cc:
  Auto merged
parents 0b85b793 76542acd

sql/sql_select.cc

+2 −1
Original line number Diff line number Diff line
@@ -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());



  }