Commit f721a6f6 authored by dkatz@damien-katzs-computer.local's avatar dkatz@damien-katzs-computer.local
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 

into  damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
parents ae22204c abdd3283

sql/sql_handler.cc

+6 −0
Original line number Diff line number Diff line
@@ -466,6 +466,12 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, 
  {

    mysql_ha_close_table(thd, tables);

    hash_tables->table= NULL;

    /*

      The lock might have been aborted, we need to manually reset

      thd->some_tables_deleted because handler's tables are closed

      in a non-standard way. Otherwise we might loop indefinitely.

    */

    thd->some_tables_deleted= 0;

    goto retry;

  }