Commit 2337181f authored by unknown's avatar unknown
Browse files

Changed condition similar to code in 4.1.

parent 93fb0652

sql/sql_handler.cc

+4 −3
Original line number Diff line number Diff line
@@ -421,11 +421,12 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, 
  if (!lock)

    goto err0; // mysql_lock_tables() printed error message already



  if (cond && ((!cond->fixed &&

                cond->fix_fields(thd, &cond)) || cond->check_cols(1)))

  if (cond)

  {

    if (table->query_id != thd->query_id)

      cond->cleanup();                          // File was reopened

    if ((!cond->fixed &&

	 cond->fix_fields(thd, &cond)) || cond->check_cols(1))

      goto err0;

  }