Commit 0eba2cf0 authored by aelkin/andrei@mysql1000.dsl.inet.fi's avatar aelkin/andrei@mysql1000.dsl.inet.fi
Browse files

Merge mysql1000.dsl.inet.fi:/home/andrei/MySQL/FIXES/5.0/bug32790-assert_mdel_norm_tables 

into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/pushed.mysql-5.0-rpl-bug33329-extra_rollback
parents 0cd061e9 991b4820

sql/sql_delete.cc

+0 −4
Original line number Diff line number Diff line
@@ -730,8 +730,6 @@ void multi_delete::send_error(uint errcode,const char *err) 
    }

    thd->transaction.all.modified_non_trans_table= true;

  }

  DBUG_ASSERT(!normal_tables || !deleted ||

              thd->transaction.stmt.modified_non_trans_table);

  DBUG_VOID_RETURN;

}
@@ -839,8 +837,6 @@ bool multi_delete::send_eof() 
  {

    query_cache_invalidate3(thd, delete_tables, 1);

  }

  DBUG_ASSERT(!normal_tables || !deleted ||

              thd->transaction.stmt.modified_non_trans_table);

  if ((local_error == 0) || thd->transaction.stmt.modified_non_trans_table)

  {

    if (mysql_bin_log.is_open())