bzr push into mysql-trunk-cluster branch (magnus.blaudd:3475 to 3476)

[magnus.blaudd]

 3476 magnus.blaudd@stripped	2012-04-19
      Cherrypick fix for binlog_multi_engine from trunk

    modified:
      mysql-test/suite/binlog/r/binlog_multi_engine.result
 3475 magnus.blaudd@stripped	2012-04-19
      WL#6224 Adapt MySQL Cluster to 5.6
       - Update .result files ror ndb_rpl since rpl_change_topology.inc
         now masks out the warning number in the warnings produced by
         CHANGE MASTER

    modified:
      mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_2innodb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_2myisam.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_2ndb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_2other.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_add_column.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_apply_status.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_auto_inc.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_basic.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_bitfield.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_blob.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_break_3_chain.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_bug22045.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_bug_13440282.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_check_for_mixed.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_2ch_rep_status.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_circular_simplex.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_basic.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_max_delete_win.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_old.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_advance.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_basic.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_dd_partitions.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ddl_open_trans.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_do_db.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_do_table.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_empty_epoch.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_gap_event.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_idempotent.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ignore_db.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_init_rep_status.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb2ndb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_innodb_trans.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_logging.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_eng_trans.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_mix_innodb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_mixed_tables.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_multi.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_myisam2ndb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_error.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_rep_ignore.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_skip_gap_event.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_slave_restart.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_stm_innodb.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_sync.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ui.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ui2.result
      mysql-test/suite/ndb_rpl/r/ndb_rpl_ui3.result
      mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb.result
      mysql-test/suite/ndb_rpl/r/rpl_truncate_7ndb_2.result
=== modified file 'mysql-test/suite/binlog/r/binlog_multi_engine.result'
--- a/mysql-test/suite/binlog/r/binlog_multi_engine.result	2011-10-04 12:53:30 +0000
+++ b/mysql-test/suite/binlog/r/binlog_multi_engine.result	2012-04-19 11:27:59 +0000
@@ -19,7 +19,7 @@ COMMIT;
 TRUNCATE t1m;
 TRUNCATE t1b;
 TRUNCATE t1n;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)
@@ -52,7 +52,7 @@ ERROR HY000: Cannot execute statement: i
 TRUNCATE t1m;
 TRUNCATE t1b;
 TRUNCATE t1n;
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2)
@@ -81,7 +81,7 @@ UPDATE t1m, t1n SET m = 2, e = 3 WHERE n
 ERROR HY000: Cannot execute statement: impossible to write to binary log since more than one engine is involved and at least one engine is self-logging.
 UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c;
 ERROR HY000: Cannot execute statement: impossible to write to binary log since more than one engine is involved and at least one engine is self-logging.
-show binlog events from <binlog_start>;
+include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Table_map	#	#	table_id: # (test.t1m)

No bundle (reason: useless for push emails).