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

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 

into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails
parents f5fe34dc 871eb3e5

mysql-test/r/mix_innodb_myisam_binlog.result

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */; 
ERROR 23000: Duplicate entry '2' for key 1

show master status /* the offset must denote there is the query */;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	369		

master-bin.000001	230		

select count(*) from t1 /* must be 4 */;

count(*)

4

sql/sql_update.cc

+1 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ void multi_update::send_error(uint errcode,const char *err) 


  if (trans_safe)

  {

    DBUG_ASSERT(transactional_tables);

    DBUG_ASSERT(!updated || transactional_tables);

    (void) ha_autocommit_or_rollback(thd, 1);

  }

  else