Commit 139e6acd 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/bug34427-rpl_vars_warn_slave_err 

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

mysql-test/r/multi_update.result

+2 −2
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ a b 
4	4

show master status /* there must be the UPDATE query event */;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	328		

master-bin.000001	189		

delete from t1;

delete from t2;

insert into t1 values (1,2),(3,4),(4,4);
@@ -555,7 +555,7 @@ UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; 
ERROR 23000: Duplicate entry '4' for key 1

show master status /* there must be the UPDATE query event */;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	343		

master-bin.000001	204		

drop table t1, t2;

drop table if exists t1, t2, t3;

CREATE TABLE t1 (a int, PRIMARY KEY (a));

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

sql/sql_update.cc

+1 −1
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ multi_update::multi_update(TABLE_LIST *table_list, 
   tmp_tables(0), updated(0), found(0), fields(field_list),

   values(value_list), table_count(0), copy_field(0),

   handle_duplicates(handle_duplicates_arg), do_update(1), trans_safe(1),

   transactional_tables(1), ignore(ignore_arg), error_handled(0)

   transactional_tables(0), ignore(ignore_arg), error_handled(0)

{}