Commit 991b4820 authored by aelkin/elkin@koti.dsl.inet.fi's avatar aelkin/elkin@koti.dsl.inet.fi
Browse files

Bug #32790 crash in trigger.test with InnoDB for a table 

the reason for the failure were incorrect asserts.

Removing asserts altogether as there is no the implication does not hold
(as explained in the comments for the file).
parent afe8ac31

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())