List:Commits« Previous MessageNext Message »
From:Li-Bing.Song Date:June 18 2010 11:11am
Subject:bzr commit into mysql-5.1-rep+2 branch (Li-Bing.Song:3192) Bug#49741
View as plain text  
#At file:///home/anders/work/bzrwork1/wt3/mysql-5.1-rep%2B2/ based on revid:sven.sandberg@stripped

 3192 Li-Bing.Song@stripped	2010-06-18
      Postfix for merging bug#49741 from 5.1(gca)

    added:
      mysql-test/include/show_events.inc
    modified:
      mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
      mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
      mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
      mysql-test/extra/rpl_tests/rpl_insert_delayed.test
      mysql-test/extra/rpl_tests/rpl_log.test
      mysql-test/extra/rpl_tests/rpl_reset_slave.test
      mysql-test/extra/rpl_tests/rpl_row_basic.test
      mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
      mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc
      mysql-test/include/show_binlog_events.inc
      mysql-test/include/show_relaylog_events.inc
      mysql-test/include/test_fieldsize.inc
      mysql-test/include/wait_for_slave_io_error.inc
      mysql-test/include/wait_for_slave_sql_error.inc
      mysql-test/r/ctype_cp932_binlog_stm.result
      mysql-test/r/flush_block_commit_notembedded.result
      mysql-test/r/multi_update.result
      mysql-test/r/sp_trans_log.result
      mysql-test/suite/binlog/r/binlog_innodb.result
      mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/r/binlog_unsafe.result
      mysql-test/suite/binlog/t/binlog_unsafe.test
      mysql-test/suite/engines/funcs/r/rpl_000015.result
      mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result
      mysql-test/suite/engines/funcs/t/rpl_000015.test
      mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
      mysql-test/suite/parts/r/rpl_partition.result
      mysql-test/suite/rpl/r/rpl_binlog_grant.result
      mysql-test/suite/rpl/r/rpl_bug33931.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
      mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
      mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result
      mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
      mysql-test/suite/rpl/r/rpl_grant.result
      mysql-test/suite/rpl/r/rpl_heartbeat.result
      mysql-test/suite/rpl/r/rpl_incident.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
      mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
      mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
      mysql-test/suite/rpl/r/rpl_log_pos.result
      mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
      mysql-test/suite/rpl/r/rpl_replicate_do.result
      mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_colSize.result
      mysql-test/suite/rpl/r/rpl_row_create_table.result
      mysql-test/suite/rpl/r/rpl_row_drop.result
      mysql-test/suite/rpl/r/rpl_row_event_max_size.result
      mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_row_log.result
      mysql-test/suite/rpl/r/rpl_row_log_innodb.result
      mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_row_reset_slave.result
      mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
      mysql-test/suite/rpl/r/rpl_row_until.result
      mysql-test/suite/rpl/r/rpl_skip_error.result
      mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
      mysql-test/suite/rpl/r/rpl_slave_skip.result
      mysql-test/suite/rpl/r/rpl_sp.result
      mysql-test/suite/rpl/r/rpl_ssl.result
      mysql-test/suite/rpl/r/rpl_ssl1.result
      mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
      mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
      mysql-test/suite/rpl/r/rpl_stm_log.result
      mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
      mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
      mysql-test/suite/rpl/r/rpl_stm_until.result
      mysql-test/suite/rpl/r/rpl_temporary_errors.result
      mysql-test/suite/rpl/t/rpl_heartbeat.test
      mysql-test/suite/rpl/t/rpl_row_event_max_size.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test
      mysql-test/t/multi_update.test
=== modified file 'mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test'
--- a/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test	2010-05-24 13:54:08 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test	2010-06-18 11:10:53 +0000
@@ -486,12 +486,12 @@ INSERT INTO t10 () VALUES(1,@b1,DEFAULT,
 
 --echo
 --echo ********************************************
---echo *** Expect slave to fail with Error 1535 ***
+--echo *** Expect slave to fail with Error 1658 ***
 --echo ********************************************
 --echo
 connection slave;
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
---let $slave_sql_errno= 1535
+# 1658 = ER_SLAVE_CONVERSION_FAILED
+--let $slave_sql_errno= 1658
 --let $slave_skip_counter= 2
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc
@@ -542,12 +542,12 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing
 
 --echo
 --echo ********************************************
---echo *** Expect slave to fail with Error 1535 ***
+--echo *** Expect slave to fail with Error 1658 ***
 --echo ********************************************
 --echo
 connection slave;
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF
---let $slave_sql_errno= 1535
+# 1658 = ER_SLAVE_CONVERSION_FAILED
+--let $slave_sql_errno= 1658
 --let $slave_skip_counter= 2
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test'
--- a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test	2010-06-17 14:52:42 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test	2010-06-18 11:10:53 +0000
@@ -101,7 +101,7 @@ SELECT * FROM t2 ORDER BY a;
 --echo *** Start Slave ***
 connection slave;
 START SLAVE;
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error.inc
 STOP SLAVE;
@@ -150,10 +150,10 @@ set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
 
 --echo ********************************************
---echo *** Expect slave to fail with Error 1522 ***
+--echo *** Expect slave to fail with Error 1658 ***
 --echo ********************************************
 connection slave;
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $slave_skip_counter= 2
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc
@@ -193,10 +193,10 @@ INSERT INTO t4 () VALUES(100.22,2,'Kyle,
                         (30000.22,4,'QA TESTING');
 
 --echo ********************************************
---echo *** Expect slave to fail with Error 1522 ***
+--echo *** Expect slave to fail with Error 1658 ***
 --echo ********************************************
 connection slave;
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $slave_skip_counter= 2
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc
@@ -236,10 +236,10 @@ INSERT INTO t5 () VALUES(1,'Kyle',200.23
                         (2,'JOE',300.01,0,'b2b2',1.0000009);
 
 --echo ********************************************
---echo *** Expect slave to fail with Error 1522 ***
+--echo *** Expect slave to fail with Error 1658 ***
 --echo ********************************************
 connection slave;
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $slave_skip_counter= 2
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc
@@ -280,10 +280,10 @@ INSERT INTO t6 () VALUES(1,'Kyle',200.23
                         (2,'JOE',300.01,0);
 
 --echo ********************************************
---echo *** Expect slave to fail with Error 1522 ***
+--echo *** Expect slave to fail with Error 1658 ***
 --echo ********************************************
 connection slave;
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error.inc
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
@@ -484,10 +484,10 @@ set @b1 = concat(@b1,@b1);
 INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 
 --echo ********************************************
---echo *** Expect slave to fail with Error 1522 ***
+--echo *** Expect slave to fail with Error 1658 ***
 --echo ********************************************
 connection slave;
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $slave_skip_counter= 2
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc
@@ -526,10 +526,10 @@ set @b1 = concat(@b1,@b1);
 INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 
 --echo ********************************************
---echo *** Expect slave to fail with Error 1522 ***
+--echo *** Expect slave to fail with Error 1658 ***
 --echo ********************************************
 connection slave;
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $slave_skip_counter= 2
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc
@@ -905,10 +905,10 @@ connection master;
 INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
 
 --echo ********************************************
---echo *** Expect slave to fail with Error 1522 ***
+--echo *** Expect slave to fail with Error 1658 ***
 --echo ********************************************
 connection slave;
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $slave_skip_counter= 2
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test'
--- a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test	2010-05-24 13:54:08 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test	2010-06-18 11:10:53 +0000
@@ -68,19 +68,15 @@ eval SET DEBUG_SYNC=$debug_sync_action;
 
 # Show slave last IO errno
 connection slave;
-source include/wait_for_slave_io_to_stop.inc;
-let $last_io_errno= query_get_value("show slave status", Last_IO_Errno, 1);
 --echo Check network error happened here
-if (`SELECT '$last_io_errno' = '2013' || # CR_SERVER_LOST
-            '$last_io_errno' = '2003' || # CR_CONN_HOST_ERROR
-            '$last_io_errno' = '2002' || # CR_CONNECTION_ERROR
-            '$last_io_errno' = '2006' || # CR_SERVER_GONE_ERROR
-            '$last_io_errno' = '1040' || # ER_CON_COUNT_ERROR
-            '$last_io_errno' = '1053'    # ER_SERVER_SHUTDOWN
-            `)
-{
-  --echo NETWORK ERROR
-}
+# '2013' CR_SERVER_LOST 
+# '2003' CR_CONN_HOST_ERROR 
+# '2002' CR_CONNECTION_ERROR 
+# '2006' CR_SERVER_GONE_ERROR 
+# '1040' ER_CON_COUNT_ERROR 
+# '1053' ER_SERVER_SHUTDOWN
+let $slave_io_errno= 1040, 1053, 2002, 2003, 2006, 2013;
+source include/wait_for_slave_io_error.inc;
 
 # deactivate the sync point of get_master_version_and_clock()
 # now to avoid restarting IO-thread to re-enter it.

=== modified file 'mysql-test/extra/rpl_tests/rpl_insert_delayed.test'
--- a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test	2010-06-17 14:52:42 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_insert_delayed.test	2010-06-18 11:10:53 +0000
@@ -91,7 +91,7 @@ connection master;
 # Bug #29571: INSERT DELAYED IGNORE written to binary log on the master but
 # on the slave
 #
-if  ($binlog_format_statement)
+if  (`SELECT @@global.binlog_format = 'STATEMENT'`)
 {
   #flush the logs before the test
   connection slave;
@@ -101,25 +101,41 @@ if  ($binlog_format_statement)
 }
 
 CREATE TABLE t1(a int, UNIQUE(a));
+--let $_start= query_get_value(SHOW MASTER STATUS, Position, 1)
+
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 flush table t1; # to wait for INSERT DELAYED to be done
-if  ($binlog_format_statement)
+if  (`SELECT @@global.binlog_format = 'STATEMENT'`)
 {
   #must show two INSERT DELAYED
   --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
-  --let $binlog_limit= 1,2
-  --source include/show_binlog_events.inc
+
+  # The first INSERT DELAYED
+  --let $stmt= query_get_value(SHOW BINLOG EVENTS IN '$binlog_file' FROM $_start, Info, 2)
+  --echo $stmt
+
+# The second INSERT DELAYED statement is the 3 item if two INSERT DELAYED are
+# handled together
+  --let $stmt= query_get_value(SHOW BINLOG EVENTS IN '$binlog_file' FROM $_start, Info, 3)
+
+# The second INSERT DELAYED statement is the 5 item if two INSERT DELAYED are
+# handled separately
+  if (`SELECT '$stmt' = 'COMMIT'`)
+  {
+    --let $stmt= query_get_value(SHOW BINLOG EVENTS IN '$binlog_file' FROM $_start, Info, 5)
+  }
+  --echo $stmt
 }
 select * from t1;
 
 sync_slave_with_master;
 echo On slave;
-if  ($binlog_format_statement)
+if  (`SELECT @@global.binlog_format = 'STATEMENT'`)
 {
   #must show two INSERT DELAYED
   --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1)
-  --let $binlog_limit= 1,2
+  --let $binlog_limit= 1,6
   --source include/show_binlog_events.inc
 }
 select * from t1;

=== modified file 'mysql-test/extra/rpl_tests/rpl_log.test'
--- a/mysql-test/extra/rpl_tests/rpl_log.test	2010-06-17 14:52:42 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_log.test	2010-06-18 11:10:53 +0000
@@ -37,7 +37,7 @@ source include/show_binlog_events.inc;
 let $binlog_limit= 2;
 source include/show_binlog_events.inc;
 
-let $binlog_limit= 2,1;
+let $binlog_limit= 1,4;
 source include/show_binlog_events.inc;
 let $binlog_limit=;
 flush logs;

=== modified file 'mysql-test/extra/rpl_tests/rpl_reset_slave.test'
--- a/mysql-test/extra/rpl_tests/rpl_reset_slave.test	2010-06-17 14:52:42 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_reset_slave.test	2010-06-18 11:10:53 +0000
@@ -20,6 +20,7 @@ source include/show_slave_status.inc;
 reset slave;
 source include/show_slave_status.inc;
 
+change master to master_user='root';
 source include/start_slave.inc;
 sync_with_master;
 source include/show_slave_status.inc;

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_basic.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test	2010-06-17 14:52:42 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test	2010-06-18 11:10:53 +0000
@@ -385,10 +385,6 @@ source include/diff_tables.inc;
 connection slave;
 SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
 
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF 
---let $slave_sql_errno= 1535 
---let $show_slave_sql_error= 1
---source include/wait_for_slave_sql_error.inc
 connection master;
 RESET MASTER;
 connection slave;
@@ -413,8 +409,8 @@ INSERT INTO t5 VALUES (1, "", 1);
 INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
 
 connection slave;
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF 
---let $slave_sql_errno= 1535 
+# 1658 = ER_SLAVE_CONVERSION_FAILED 
+--let $slave_sql_errno= 1658 
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error.inc
 connection master;
@@ -431,8 +427,8 @@ INSERT INTO t6 VALUES (1, "", 1);
 INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
 
 connection slave;
-# 1535 = ER_BINLOG_ROW_WRONG_TABLE_DEF 
---let $slave_sql_errno= 1535 
+# 1658 = ER_SLAVE_CONVERSION_FAILED 
+--let $slave_sql_errno= 1658 
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error.inc
 connection master;

=== modified file 'mysql-test/extra/rpl_tests/rpl_row_tabledefs.test'
--- a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test	2010-06-17 14:52:42 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test	2010-06-18 11:10:53 +0000
@@ -148,7 +148,7 @@ connection master;
 INSERT INTO t4 VALUES (4);
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc
 
@@ -160,7 +160,7 @@ connection master;
 INSERT INTO t5 VALUES (5,10,25);
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc
 
@@ -172,7 +172,7 @@ connection master;
 INSERT INTO t6 VALUES (6,12,36);
 connection slave;
 --let $slave_skip_counter= 2
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc
 

=== modified file 'mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc'
--- a/mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc	2009-11-03 19:02:56 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc	2010-06-18 11:10:53 +0000
@@ -9,113 +9,96 @@ INSERT INTO t1 VALUES (5);
 INSERT INTO t1 VALUES (6);
 
 -- echo [MASTER] ********* SOW BINLOG EVENTS IN ...  *********
-let $binary_log_file= master-bin.000001;
 -- source include/show_binlog_events.inc
 
 -- echo [MASTER] ********* SOW BINLOG EVENTS         *********
-let $binary_log_file= ;
+let $binlog_file= ;
 -- source include/show_binlog_events.inc
 
 -- echo [MASTER] ********* SOW BINLOG EVENTS ... LIMIT rows  *********
-let $binary_log_file= ;
-let $binary_log_limit_row= 3;
+let $binlog_limit= 3;
 -- source include/show_binlog_events.inc
 
 -- echo [MASTER] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
-let $binary_log_file= ;
-let $binary_log_limit_row= 4;
-let $binary_log_limit_offset= 1;
+let $binlog_limit= 1,4;
 -- source include/show_binlog_events.inc
 
 # clear show_binlog_event/show_relaylog_events parameters
-let $binary_log_file= ;
-let $binary_log_limit_row= ;
-let $binary_log_limit_offset= ;
+let $binlog_limit= ;
 
 -- sync_slave_with_master
 
 -- echo [SLAVE] ********* SOW BINLOG EVENTS IN ...   *********
-let $binary_log_file= slave-bin.000001;
 -- source include/show_binlog_events.inc
 
 -- echo [SLAVE] ********* SOW BINLOG EVENTS          *********
-let $binary_log_file= ;
+let $binlog_file= ;
 -- source include/show_binlog_events.inc
 
 -- echo [SLAVE] ********* SOW BINLOG EVENTS ... LIMIT rows  *********
-let $binary_log_file= ;
-let $binary_log_limit_row= 3;
+let $binlog_limit= 3;
 -- source include/show_binlog_events.inc
 
 -- echo [SLAVE] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
-let $binary_log_file= ;
-let $binary_log_limit_row= 4;
-let $binary_log_limit_offset= 1;
+let $binlog_limit= 1,4;
 -- source include/show_binlog_events.inc
 
 # clear show_binlog_event/show_relaylog_events parameters
-let $binary_log_file= ;
-let $binary_log_limit_row= ;
-let $binary_log_limit_offset= ;
+let $binlog_limit= ;
 
 -- echo [SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
-let $binary_log_file= slave-relay-bin.000003;
+let $binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1);
 -- source include/show_relaylog_events.inc
 
 -- echo [SLAVE] ********* SOW RELAYLOG EVENTS        *********
-let $binary_log_file= ;
+let $binlog_file= ;
 -- source include/show_relaylog_events.inc
 
 -- echo [MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT rows  *********
-let $binary_log_file= slave-relay-bin.000003;
-let $binary_log_limit_row= 3;
-let $binary_log_limit_offset= ;
+let $binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1);
+let $binlog_limit= 3;
 -- source include/show_relaylog_events.inc
 
 -- echo [MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT offset,rows  *********
-let $binary_log_file= slave-relay-bin.000003;
-let $binary_log_limit_offset= 1;
-let $binary_log_limit_row= 3;
+let $binlog_limit= 1,3;
 -- source include/show_relaylog_events.inc
 
 FLUSH LOGS;
+let $binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1);
 
 -- connection master
 FLUSH LOGS;
 DROP TABLE t1;
 
 # clear show_binlog_event/show_relaylog_events parameters
-let $binary_log_file= ;
-let $binary_log_limit_row= ;
-let $binary_log_limit_offset= ;
+let $binlog_file= ;
+let $binlog_limit= ;
 
 -- echo [MASTER] ********* SOW BINLOG EVENTS IN ...  *********
-let $binary_log_file= master-bin.000002;
+let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
 -- source include/show_binlog_events.inc
 
 -- echo [MASTER] ********* SOW BINLOG EVENTS         *********
-let $binary_log_file= ;
+let $binlog_file= ;
 -- source include/show_binlog_events.inc
 
 -- sync_slave_with_master
 
 -- echo [SLAVE] ********* SOW BINLOG EVENTS IN ...   *********
-let $binary_log_file= slave-bin.000002;
+let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
 -- source include/show_binlog_events.inc
 
 -- echo [SLAVE] ********* SOW BINLOG EVENTS          *********
-let $binary_log_file= ;
+let $binlog_file= ;
 -- source include/show_binlog_events.inc
 
 -- echo [SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
-let $binary_log_file= slave-relay-bin.000005;
 -- source include/show_relaylog_events.inc
 
 -- echo [SLAVE] ********* SOW RELAYLOG EVENTS        *********
-let $binary_log_file= ;
+let $binlog_file= ;
 -- source include/show_relaylog_events.inc
 
 # clear show_binlog_event/show_relaylog_events parameters
-let $binary_log_name= ;
-let $binary_log_limit_row= ;
-let $binary_log_limit_offset= ;
+let $binlog_file= ;
+let $binlog_limit= ;

=== modified file 'mysql-test/include/show_binlog_events.inc'
--- a/mysql-test/include/show_binlog_events.inc	2010-06-17 14:52:42 +0000
+++ b/mysql-test/include/show_binlog_events.inc	2010-06-18 11:10:53 +0000
@@ -17,29 +17,5 @@
 #
 ##############################################################################
 
-if (!$binlog_start)
-{
-  # If $binlog_start is not set, we will set it as the second event's position.
-  # The first event(Description Event) is always ignored. For description
-  # event's length might be changed because of adding new events, 'SHOW BINLOG
-  # EVENTS LIMIT 1' is used to get the right value.
-  --let $binlog_start= query_get_value(SHOW BINLOG EVENTS LIMIT 1, End_log_pos, 1)
-}
-
---let $_statement=show binlog events
-if (`SELECT '$binlog_file' <> ''`)
-{
-  --let $_statement= $_statement in '$binlog_file'
-}
-
---let $_statement= $_statement from $binlog_start
-
-if (`SELECT '$binlog_limit' <> ''`)
-{
-  --let $_statement= $_statement limit $binlog_limit
-}
-
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
---replace_column 2 # 4 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/
---eval $_statement
+--let $is_relay_log= 0
+--source include/show_events.inc

=== added file 'mysql-test/include/show_events.inc'
--- a/mysql-test/include/show_events.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/show_events.inc	2010-06-18 11:10:53 +0000
@@ -0,0 +1,36 @@
+##############################################################################
+# It's an auxiliary file used to show binary log events or relay log events.
+# It is only called by show_binlog_events.inc and show_relaylog_events.inc.
+##############################################################################
+
+if (!$binlog_start)
+{
+  # If $binlog_start is not set, we will set it as the second event's
+  # position.  The first event(Description Event) is always ignored. For
+  # description event's length might be changed because of adding new events,
+  # 'SHOW BINLOG EVENTS LIMIT 1' is used to get the right value.
+  --let $binlog_start= query_get_value(SHOW BINLOG EVENTS LIMIT 1, End_log_pos, 1)
+}
+
+--let $_statement=show binlog events
+if ($is_relay_log)
+{
+  --let $_statement=show relaylog events
+}
+
+if (`SELECT '$binlog_file' <> ''`)
+{
+  --let $_statement= $_statement in '$binlog_file'
+}
+
+--let $_statement= $_statement from $binlog_start
+
+if (`SELECT '$binlog_limit' <> ''`)
+{
+  --let $_statement= $_statement limit $binlog_limit
+}
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
+--replace_column 2 # 4 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /Server ver:.*$/SERVER_VERSION, BINLOG_VERSION/
+--eval $_statement

=== modified file 'mysql-test/include/show_relaylog_events.inc'
--- a/mysql-test/include/show_relaylog_events.inc	2009-09-28 23:04:20 +0000
+++ b/mysql-test/include/show_relaylog_events.inc	2010-06-18 11:10:53 +0000
@@ -1,35 +1,21 @@
-# $binlog_start can be set by caller or take a default value
-# $binary_log_file the name of the log file show
-# $binary_log_limit_row - sets the number of binlog rows to be returned
-# $binary_log_limit_offset - sets the offset where to start returning events
+##############################################################################
+# Show relay log events 
+#
+# Useage: 
+# let $binlog_file= slave-relay-bin.000002; 
+# let $binlog_start= 106; 
+# let $binlog_limit= 1, 3; 
+# source include/show_relaylog_events.inc;
+#
+# It shows the first relay log file if $binlog_file is not given. 
+#
+# It shows events from the end position of the description event if
+# $binlog_start is not given.
+#
+# It shows all of the events if $binlog_limit is not given. 
+# $binlog_format has the same semantic with 'LIMIT' option.
+#
+##############################################################################
 
-let $show_binlog_events= show relaylog events;
-
-if (!$binlog_start)
-{
-  # defaults to chop the first event in the binary log
-  let $binlog_start=106;
-}
-
-if (!`SELECT '$binary_log_file' = ''`)
-{
-    let $show_binlog_events= $show_binlog_events in '$binary_log_file';
-}
-let $show_binlog_events= $show_binlog_events from $binlog_start;
-
-if ($binary_log_limit_row)
-{
-  let $limit= limit;
-  if ($binary_log_limit_offset)
-  {
-    let $limit= $limit $binary_log_limit_offset, ;
-  }
-
-  let $limit= $limit $binary_log_limit_row;
-  let $show_binlog_events= $show_binlog_events $limit;
-}
-
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
---replace_column 2 # 4 # 5 #
---replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/ /Server ver:.*$/SERVER_VERSION, BINLOG_VERSION/
---eval $show_binlog_events
+--let $is_relay_log= 1
+--source include/show_events.inc

=== modified file 'mysql-test/include/test_fieldsize.inc'
--- a/mysql-test/include/test_fieldsize.inc	2010-06-17 14:52:42 +0000
+++ b/mysql-test/include/test_fieldsize.inc	2010-06-18 11:10:53 +0000
@@ -22,7 +22,7 @@ eval $test_insert;
 
 connection slave;
 START SLAVE;
---let $slave_sql_errno= 1535
+--let $slave_sql_errno= 1658
 --let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error.inc
 

=== modified file 'mysql-test/include/wait_for_slave_io_error.inc'
--- a/mysql-test/include/wait_for_slave_io_error.inc	2010-05-24 13:54:08 +0000
+++ b/mysql-test/include/wait_for_slave_io_error.inc	2010-06-18 11:10:53 +0000
@@ -6,14 +6,21 @@
 #
 # ==== Usage ====
 #
+# # Wait several errors.  
+# let $slave_io_errno= 1, 2, 3; 
+# source include/wait_for_slave_io_error.inc;
+#
+# # Print error message 
+# let $slave_io_errno= 1; 
+# let $show_slave_io_error= 1; 
 # source include/wait_for_slave_io_error.inc;
 #
 # Parameters:
 #
 # $slave_io_errno
-#   The expected IO error number.  This is required.
+#   The expected IO error numbers.  This is required.
 #   (After BUG#41956 has been fixed, this will be required to be a
-#   symbolic name instead of a number.)
+#   symbolic name instead of a numbers.)
 #
 # $show_slave_io_error
 #   If set, will print the error to the query log.
@@ -28,13 +35,17 @@ if (`SELECT '$slave_io_errno' = ''`) {
   --die !!!ERROR IN TEST: you must set \$slave_io_errno before sourcing wait_for_slave_io_error.inc
 }
 
-let $slave_param= Slave_IO_Running;
-let $slave_param_value= No;
-let $slave_error_message= Failed while waiting for slave to stop the IO thread (expecting error in the IO thread);
+let $old_slave_param_comparison= $slave_param_comparison;
+let $slave_param= Last_IO_Errno;
+let $slave_param_comparison= !=;
+let $slave_param_value= 0;
+let $slave_error_message= Failed while waiting for slave to produce an error in its sql thread;
 source include/wait_for_slave_param.inc;
+let $slave_error_message= ;
+let $slave_param_comparison= $old_slave_param_comparison;
 
 let $_error= query_get_value(SHOW SLAVE STATUS, Last_IO_Errno, 1);
-if (`SELECT '$_error' != '$slave_io_errno'`) {
+if (`SELECT $_error NOT IN ($slave_io_errno)`) {
   --echo **** Slave stopped with wrong error code: $_error (expected $slave_io_errno) ****
   source include/show_rpl_debug_info.inc;
   --echo **** Slave stopped with wrong error code: $_error (expected $slave_io_errno) ****

=== modified file 'mysql-test/include/wait_for_slave_sql_error.inc'
--- a/mysql-test/include/wait_for_slave_sql_error.inc	2010-06-17 14:52:42 +0000
+++ b/mysql-test/include/wait_for_slave_sql_error.inc	2010-06-18 11:10:53 +0000
@@ -6,14 +6,21 @@
 #
 # ==== Usage ====
 #
+# # Wait several errors.  
+# let $slave_sql_errno= 1, 2, 3; 
+# source include/wait_for_slave_sql_error.inc;
+#
+# # Print error message 
+# let $slave_sql_errno= 1; 
+# let $show_slave_sql_error= 1; 
 # source include/wait_for_slave_sql_error.inc;
 #
 # Parameters:
 #
 # $slave_sql_errno
-#   The expected SQL error number.  This is required.
+#   The expected SQL error numbers.  This is required.
 #   (After BUG#41956 has been fixed, this will be required to be a
-#   symbolic name instead of a number.)
+#   symbolic name instead of a numbers.)
 #
 # $show_slave_sql_error
 #   If set, will print the error to the query log.
@@ -34,7 +41,7 @@ let $slave_error_message= Failed while w
 source include/wait_for_slave_param.inc;
 
 let $_error= query_get_value(SHOW SLAVE STATUS, Last_SQL_Errno, 1);
-if (`SELECT NOT($_error IN $slave_sql_errno)`) {
+if (`SELECT $_error NOT IN ($slave_sql_errno)`) {
   --echo **** Slave stopped with wrong error code: $_error (expected $slave_sql_errno) ****
   source include/show_rpl_debug_info.inc;
   --echo **** Slave stopped with wrong error code: $_error (expected $slave_sql_errno) ****

=== modified file 'mysql-test/r/ctype_cp932_binlog_stm.result'
--- a/mysql-test/r/ctype_cp932_binlog_stm.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result	2010-06-18 11:10:53 +0000
@@ -32,43 +32,22 @@ HEX(s1)	HEX(s2)	d
 466F6F2773206120426172	ED40ED41ED42	47.93
 DROP PROCEDURE bug18293|
 DROP TABLE t4|
-<<<<<<< TREE
-SHOW BINLOG EVENTS FROM 514|
-=======
 show binlog events from <binlog_start>|
->>>>>>> MERGE-SOURCE
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	514	Query	1	581	BEGIN
-master-bin.000001	581	Query	1	788	use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_latin1'Error in Log_event::read_log_event()' COLLATE 'latin1_swedish_ci'))
-master-bin.000001	788	Query	1	856	COMMIT
-master-bin.000001	856	Query	1	1019	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
->>>>>>> MERGE-SOURCE
 s2 CHAR(50) CHARACTER SET cp932,
 d DECIMAL(10,2))
-<<<<<<< TREE
-master-bin.000001	1019	Query	1	1265	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `bug18293`(IN ins1 CHAR(50),
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `bug18293`(IN ins1 CHAR(50),
->>>>>>> MERGE-SOURCE
 IN ins2 CHAR(50) CHARACTER SET cp932,
 IN ind DECIMAL(10,2))
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-<<<<<<< TREE
-master-bin.000001	1265	Query	1	1333	BEGIN
-master-bin.000001	1333	Query	1	1597	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172 COLLATE 'latin1_swedish_ci'),  NAME_CONST('ins2',_cp932 0xED40ED41ED42 COLLATE 'cp932_japanese_ci'),  NAME_CONST('ind',47.93))
-master-bin.000001	1597	Query	1	1666	COMMIT
-master-bin.000001	1666	Query	1	1752	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1752	Query	1	1828	use `test`; DROP TABLE t4
-=======
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172 COLLATE 'latin1_swedish_ci'),  NAME_CONST('ins2',_cp932 0xED40ED41ED42 COLLATE 'cp932_japanese_ci'),  NAME_CONST('ind',47.93))
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE bug18293
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t4
->>>>>>> MERGE-SOURCE
 End of 5.0 tests
 SHOW BINLOG EVENTS FROM 490;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error

=== modified file 'mysql-test/r/flush_block_commit_notembedded.result'
--- a/mysql-test/r/flush_block_commit_notembedded.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/r/flush_block_commit_notembedded.result	2010-06-18 11:10:53 +0000
@@ -7,25 +7,13 @@ SET AUTOCOMMIT=0;
 INSERT t1 VALUES (1);
 # Switch to connection con2
 FLUSH TABLES WITH READ LOCK;
-<<<<<<< TREE
-SHOW MASTER STATUS;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	107		
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
->>>>>>> MERGE-SOURCE
 # Switch to connection con1
 COMMIT;
 # Switch to connection con2
-<<<<<<< TREE
-SHOW MASTER STATUS;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	107		
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
->>>>>>> MERGE-SOURCE
 UNLOCK TABLES;
 # Switch to connection con1
 DROP TABLE t1;

=== modified file 'mysql-test/r/multi_update.result'
--- a/mysql-test/r/multi_update.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/r/multi_update.result	2010-06-18 11:10:53 +0000
@@ -602,12 +602,11 @@ select * from t2 /* must be (3,1), (4,4)
 a	b
 3	1
 4	4
-<<<<<<< TREE
-show master status /* there must be the UPDATE query event */;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	344		
-=======
->>>>>>> MERGE-SOURCE
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; UPDATE t2,t1 SET t2.a=t1.a+2
+master-bin.000001	#	Query	#	#	COMMIT
 delete from t1;
 delete from t2;
 insert into t1 values (1,2),(3,4),(4,4);
@@ -615,12 +614,11 @@ insert into t2 values (1,2),(3,4),(4,4);
 reset master;
 UPDATE t2,t1  SET t2.a=t2.b where t2.a=t1.a;
 ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
-<<<<<<< TREE
-show master status /* there must be the UPDATE query event */;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	359		
-=======
->>>>>>> MERGE-SOURCE
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; UPDATE t2,t1  SET t2.a=t2.b where t2.a=t1.a
+master-bin.000001	#	Query	#	#	COMMIT
 drop table t1, t2;
 set @@session.binlog_format= @sav_binlog_format;
 drop table if exists t1, t2, t3;

=== modified file 'mysql-test/r/sp_trans_log.result'
--- a/mysql-test/r/sp_trans_log.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/r/sp_trans_log.result	2010-06-18 11:10:53 +0000
@@ -14,18 +14,14 @@ end|
 reset master|
 insert into t2 values (bug23333(),1)|
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-<<<<<<< TREE
-=======
 show binlog events from <binlog_start>|
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	ROLLBACK
+master-bin.000001	#	Query	#	#	COMMIT
 select count(*),@a from t1 /* must be 1,1 */|
 count(*)	@a
 1	1
->>>>>>> MERGE-SOURCE
 drop table t1,t2;
 drop function if exists bug23333;

=== modified file 'mysql-test/suite/binlog/r/binlog_innodb.result'
--- a/mysql-test/suite/binlog/r/binlog_innodb.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/binlog/r/binlog_innodb.result	2010-06-18 11:10:53 +0000
@@ -156,16 +156,9 @@ select * from t2 /* must be (3,1), (4,4)
 a	b
 1	1
 4	4
-<<<<<<< TREE
-there must no UPDATE in binlog
-show master status;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
-=======
 # There must no UPDATE in binlog;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
->>>>>>> MERGE-SOURCE
 delete from t1;
 delete from t2;
 insert into t1 values (1,2),(3,4),(4,4);
@@ -173,15 +166,8 @@ insert into t2 values (1,2),(3,4),(4,4);
 reset master;
 UPDATE t2,t1  SET t2.a=t2.b where t2.a=t1.a;
 ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
-<<<<<<< TREE
-there must no UPDATE in binlog
-show master status;
-File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
-=======
 # There must be no UPDATE query event;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
->>>>>>> MERGE-SOURCE
 drop table t1, t2;
 End of tests

=== modified file 'mysql-test/suite/binlog/r/binlog_row_binlog.result'
--- a/mysql-test/suite/binlog/r/binlog_row_binlog.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result	2010-06-18 11:10:53 +0000
@@ -26,217 +26,6 @@ create table t1 (n int) engine=innodb;
 begin;
 commit;
 drop table t1;
-<<<<<<< TREE
-show binlog events in 'master-bin.000001' from 107;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (n int) engine=innodb
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	1	#	COMMIT /* xid= */
-master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
-show binlog events in 'master-bin.000002' from 107;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	#	Query	1	#	use `test`; drop table t1
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (n int) engine=innodb
@@ -446,7 +235,6 @@ master-bin.000001	#	Rotate	#	#	master-bi
 show binlog events in 'master-bin.000002' from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Query	#	#	use `test`; drop table t1
->>>>>>> MERGE-SOURCE
 set @ac = @@autocommit;
 set autocommit= 0;
 reset master;
@@ -459,19 +247,6 @@ commit;
 drop table t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
-master-bin.000001	107	Query	1	206	use `test`; create table t1(n int) engine=innodb
-master-bin.000001	206	Query	1	274	BEGIN
-master-bin.000001	274	Table_map	1	315	table_id: # (test.t1)
-master-bin.000001	315	Write_rows	1	349	table_id: # flags: STMT_END_F
-master-bin.000001	349	Table_map	1	390	table_id: # (test.t1)
-master-bin.000001	390	Write_rows	1	424	table_id: # flags: STMT_END_F
-master-bin.000001	424	Table_map	1	465	table_id: # (test.t1)
-master-bin.000001	465	Write_rows	1	499	table_id: # flags: STMT_END_F
-master-bin.000001	499	Xid	1	526	COMMIT /* XID */
-master-bin.000001	526	Query	1	602	use `test`; drop table t1
-=======
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int) engine=innodb
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -482,824 +257,12 @@ master-bin.000001	#	Table_map	#	#	table_
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Query	#	#	use `test`; drop table t1
->>>>>>> MERGE-SOURCE
 set @bcs = @@binlog_cache_size;
 set global binlog_cache_size=4096;
 reset master;
 create table t1 (a int) engine=innodb;
-<<<<<<< TREE
-show binlog events from 0;
-=======
 show binlog events from <binlog_start>;
->>>>>>> MERGE-SOURCE
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
-master-bin.000001	107	Query	1	207	use `test`; create table t1 (a int) engine=innodb
-master-bin.000001	207	Query	1	275	BEGIN
-master-bin.000001	275	Table_map	1	316	table_id: # (test.t1)
-master-bin.000001	316	Write_rows	1	350	table_id: # flags: STMT_END_F
-master-bin.000001	350	Table_map	1	391	table_id: # (test.t1)
-master-bin.000001	391	Write_rows	1	425	table_id: # flags: STMT_END_F
-master-bin.000001	425	Table_map	1	466	table_id: # (test.t1)
-master-bin.000001	466	Write_rows	1	500	table_id: # flags: STMT_END_F
-master-bin.000001	500	Table_map	1	541	table_id: # (test.t1)
-master-bin.000001	541	Write_rows	1	575	table_id: # flags: STMT_END_F
-master-bin.000001	575	Table_map	1	616	table_id: # (test.t1)
-master-bin.000001	616	Write_rows	1	650	table_id: # flags: STMT_END_F
-master-bin.000001	650	Table_map	1	691	table_id: # (test.t1)
-master-bin.000001	691	Write_rows	1	725	table_id: # flags: STMT_END_F
-master-bin.000001	725	Table_map	1	766	table_id: # (test.t1)
-master-bin.000001	766	Write_rows	1	800	table_id: # flags: STMT_END_F
-master-bin.000001	800	Table_map	1	841	table_id: # (test.t1)
-master-bin.000001	841	Write_rows	1	875	table_id: # flags: STMT_END_F
-master-bin.000001	875	Table_map	1	916	table_id: # (test.t1)
-master-bin.000001	916	Write_rows	1	950	table_id: # flags: STMT_END_F
-master-bin.000001	950	Table_map	1	991	table_id: # (test.t1)
-master-bin.000001	991	Write_rows	1	1025	table_id: # flags: STMT_END_F
-master-bin.000001	1025	Table_map	1	1066	table_id: # (test.t1)
-master-bin.000001	1066	Write_rows	1	1100	table_id: # flags: STMT_END_F
-master-bin.000001	1100	Table_map	1	1141	table_id: # (test.t1)
-master-bin.000001	1141	Write_rows	1	1175	table_id: # flags: STMT_END_F
-master-bin.000001	1175	Table_map	1	1216	table_id: # (test.t1)
-master-bin.000001	1216	Write_rows	1	1250	table_id: # flags: STMT_END_F
-master-bin.000001	1250	Table_map	1	1291	table_id: # (test.t1)
-master-bin.000001	1291	Write_rows	1	1325	table_id: # flags: STMT_END_F
-master-bin.000001	1325	Table_map	1	1366	table_id: # (test.t1)
-master-bin.000001	1366	Write_rows	1	1400	table_id: # flags: STMT_END_F
-master-bin.000001	1400	Table_map	1	1441	table_id: # (test.t1)
-master-bin.000001	1441	Write_rows	1	1475	table_id: # flags: STMT_END_F
-master-bin.000001	1475	Table_map	1	1516	table_id: # (test.t1)
-master-bin.000001	1516	Write_rows	1	1550	table_id: # flags: STMT_END_F
-master-bin.000001	1550	Table_map	1	1591	table_id: # (test.t1)
-master-bin.000001	1591	Write_rows	1	1625	table_id: # flags: STMT_END_F
-master-bin.000001	1625	Table_map	1	1666	table_id: # (test.t1)
-master-bin.000001	1666	Write_rows	1	1700	table_id: # flags: STMT_END_F
-master-bin.000001	1700	Table_map	1	1741	table_id: # (test.t1)
-master-bin.000001	1741	Write_rows	1	1775	table_id: # flags: STMT_END_F
-master-bin.000001	1775	Table_map	1	1816	table_id: # (test.t1)
-master-bin.000001	1816	Write_rows	1	1850	table_id: # flags: STMT_END_F
-master-bin.000001	1850	Table_map	1	1891	table_id: # (test.t1)
-master-bin.000001	1891	Write_rows	1	1925	table_id: # flags: STMT_END_F
-master-bin.000001	1925	Table_map	1	1966	table_id: # (test.t1)
-master-bin.000001	1966	Write_rows	1	2000	table_id: # flags: STMT_END_F
-master-bin.000001	2000	Table_map	1	2041	table_id: # (test.t1)
-master-bin.000001	2041	Write_rows	1	2075	table_id: # flags: STMT_END_F
-master-bin.000001	2075	Table_map	1	2116	table_id: # (test.t1)
-master-bin.000001	2116	Write_rows	1	2150	table_id: # flags: STMT_END_F
-master-bin.000001	2150	Table_map	1	2191	table_id: # (test.t1)
-master-bin.000001	2191	Write_rows	1	2225	table_id: # flags: STMT_END_F
-master-bin.000001	2225	Table_map	1	2266	table_id: # (test.t1)
-master-bin.000001	2266	Write_rows	1	2300	table_id: # flags: STMT_END_F
-master-bin.000001	2300	Table_map	1	2341	table_id: # (test.t1)
-master-bin.000001	2341	Write_rows	1	2375	table_id: # flags: STMT_END_F
-master-bin.000001	2375	Table_map	1	2416	table_id: # (test.t1)
-master-bin.000001	2416	Write_rows	1	2450	table_id: # flags: STMT_END_F
-master-bin.000001	2450	Table_map	1	2491	table_id: # (test.t1)
-master-bin.000001	2491	Write_rows	1	2525	table_id: # flags: STMT_END_F
-master-bin.000001	2525	Table_map	1	2566	table_id: # (test.t1)
-master-bin.000001	2566	Write_rows	1	2600	table_id: # flags: STMT_END_F
-master-bin.000001	2600	Table_map	1	2641	table_id: # (test.t1)
-master-bin.000001	2641	Write_rows	1	2675	table_id: # flags: STMT_END_F
-master-bin.000001	2675	Table_map	1	2716	table_id: # (test.t1)
-master-bin.000001	2716	Write_rows	1	2750	table_id: # flags: STMT_END_F
-master-bin.000001	2750	Table_map	1	2791	table_id: # (test.t1)
-master-bin.000001	2791	Write_rows	1	2825	table_id: # flags: STMT_END_F
-master-bin.000001	2825	Table_map	1	2866	table_id: # (test.t1)
-master-bin.000001	2866	Write_rows	1	2900	table_id: # flags: STMT_END_F
-master-bin.000001	2900	Table_map	1	2941	table_id: # (test.t1)
-master-bin.000001	2941	Write_rows	1	2975	table_id: # flags: STMT_END_F
-master-bin.000001	2975	Table_map	1	3016	table_id: # (test.t1)
-master-bin.000001	3016	Write_rows	1	3050	table_id: # flags: STMT_END_F
-master-bin.000001	3050	Table_map	1	3091	table_id: # (test.t1)
-master-bin.000001	3091	Write_rows	1	3125	table_id: # flags: STMT_END_F
-master-bin.000001	3125	Table_map	1	3166	table_id: # (test.t1)
-master-bin.000001	3166	Write_rows	1	3200	table_id: # flags: STMT_END_F
-master-bin.000001	3200	Table_map	1	3241	table_id: # (test.t1)
-master-bin.000001	3241	Write_rows	1	3275	table_id: # flags: STMT_END_F
-master-bin.000001	3275	Table_map	1	3316	table_id: # (test.t1)
-master-bin.000001	3316	Write_rows	1	3350	table_id: # flags: STMT_END_F
-master-bin.000001	3350	Table_map	1	3391	table_id: # (test.t1)
-master-bin.000001	3391	Write_rows	1	3425	table_id: # flags: STMT_END_F
-master-bin.000001	3425	Table_map	1	3466	table_id: # (test.t1)
-master-bin.000001	3466	Write_rows	1	3500	table_id: # flags: STMT_END_F
-master-bin.000001	3500	Table_map	1	3541	table_id: # (test.t1)
-master-bin.000001	3541	Write_rows	1	3575	table_id: # flags: STMT_END_F
-master-bin.000001	3575	Table_map	1	3616	table_id: # (test.t1)
-master-bin.000001	3616	Write_rows	1	3650	table_id: # flags: STMT_END_F
-master-bin.000001	3650	Table_map	1	3691	table_id: # (test.t1)
-master-bin.000001	3691	Write_rows	1	3725	table_id: # flags: STMT_END_F
-master-bin.000001	3725	Table_map	1	3766	table_id: # (test.t1)
-master-bin.000001	3766	Write_rows	1	3800	table_id: # flags: STMT_END_F
-master-bin.000001	3800	Table_map	1	3841	table_id: # (test.t1)
-master-bin.000001	3841	Write_rows	1	3875	table_id: # flags: STMT_END_F
-master-bin.000001	3875	Table_map	1	3916	table_id: # (test.t1)
-master-bin.000001	3916	Write_rows	1	3950	table_id: # flags: STMT_END_F
-master-bin.000001	3950	Table_map	1	3991	table_id: # (test.t1)
-master-bin.000001	3991	Write_rows	1	4025	table_id: # flags: STMT_END_F
-master-bin.000001	4025	Table_map	1	4066	table_id: # (test.t1)
-master-bin.000001	4066	Write_rows	1	4100	table_id: # flags: STMT_END_F
-master-bin.000001	4100	Table_map	1	4141	table_id: # (test.t1)
-master-bin.000001	4141	Write_rows	1	4175	table_id: # flags: STMT_END_F
-master-bin.000001	4175	Table_map	1	4216	table_id: # (test.t1)
-master-bin.000001	4216	Write_rows	1	4250	table_id: # flags: STMT_END_F
-master-bin.000001	4250	Table_map	1	4291	table_id: # (test.t1)
-master-bin.000001	4291	Write_rows	1	4325	table_id: # flags: STMT_END_F
-master-bin.000001	4325	Table_map	1	4366	table_id: # (test.t1)
-master-bin.000001	4366	Write_rows	1	4400	table_id: # flags: STMT_END_F
-master-bin.000001	4400	Table_map	1	4441	table_id: # (test.t1)
-master-bin.000001	4441	Write_rows	1	4475	table_id: # flags: STMT_END_F
-master-bin.000001	4475	Table_map	1	4516	table_id: # (test.t1)
-master-bin.000001	4516	Write_rows	1	4550	table_id: # flags: STMT_END_F
-master-bin.000001	4550	Table_map	1	4591	table_id: # (test.t1)
-master-bin.000001	4591	Write_rows	1	4625	table_id: # flags: STMT_END_F
-master-bin.000001	4625	Table_map	1	4666	table_id: # (test.t1)
-master-bin.000001	4666	Write_rows	1	4700	table_id: # flags: STMT_END_F
-master-bin.000001	4700	Table_map	1	4741	table_id: # (test.t1)
-master-bin.000001	4741	Write_rows	1	4775	table_id: # flags: STMT_END_F
-master-bin.000001	4775	Table_map	1	4816	table_id: # (test.t1)
-master-bin.000001	4816	Write_rows	1	4850	table_id: # flags: STMT_END_F
-master-bin.000001	4850	Table_map	1	4891	table_id: # (test.t1)
-master-bin.000001	4891	Write_rows	1	4925	table_id: # flags: STMT_END_F
-master-bin.000001	4925	Table_map	1	4966	table_id: # (test.t1)
-master-bin.000001	4966	Write_rows	1	5000	table_id: # flags: STMT_END_F
-master-bin.000001	5000	Table_map	1	5041	table_id: # (test.t1)
-master-bin.000001	5041	Write_rows	1	5075	table_id: # flags: STMT_END_F
-master-bin.000001	5075	Table_map	1	5116	table_id: # (test.t1)
-master-bin.000001	5116	Write_rows	1	5150	table_id: # flags: STMT_END_F
-master-bin.000001	5150	Table_map	1	5191	table_id: # (test.t1)
-master-bin.000001	5191	Write_rows	1	5225	table_id: # flags: STMT_END_F
-master-bin.000001	5225	Table_map	1	5266	table_id: # (test.t1)
-master-bin.000001	5266	Write_rows	1	5300	table_id: # flags: STMT_END_F
-master-bin.000001	5300	Table_map	1	5341	table_id: # (test.t1)
-master-bin.000001	5341	Write_rows	1	5375	table_id: # flags: STMT_END_F
-master-bin.000001	5375	Table_map	1	5416	table_id: # (test.t1)
-master-bin.000001	5416	Write_rows	1	5450	table_id: # flags: STMT_END_F
-master-bin.000001	5450	Table_map	1	5491	table_id: # (test.t1)
-master-bin.000001	5491	Write_rows	1	5525	table_id: # flags: STMT_END_F
-master-bin.000001	5525	Table_map	1	5566	table_id: # (test.t1)
-master-bin.000001	5566	Write_rows	1	5600	table_id: # flags: STMT_END_F
-master-bin.000001	5600	Table_map	1	5641	table_id: # (test.t1)
-master-bin.000001	5641	Write_rows	1	5675	table_id: # flags: STMT_END_F
-master-bin.000001	5675	Table_map	1	5716	table_id: # (test.t1)
-master-bin.000001	5716	Write_rows	1	5750	table_id: # flags: STMT_END_F
-master-bin.000001	5750	Table_map	1	5791	table_id: # (test.t1)
-master-bin.000001	5791	Write_rows	1	5825	table_id: # flags: STMT_END_F
-master-bin.000001	5825	Table_map	1	5866	table_id: # (test.t1)
-master-bin.000001	5866	Write_rows	1	5900	table_id: # flags: STMT_END_F
-master-bin.000001	5900	Table_map	1	5941	table_id: # (test.t1)
-master-bin.000001	5941	Write_rows	1	5975	table_id: # flags: STMT_END_F
-master-bin.000001	5975	Table_map	1	6016	table_id: # (test.t1)
-master-bin.000001	6016	Write_rows	1	6050	table_id: # flags: STMT_END_F
-master-bin.000001	6050	Table_map	1	6091	table_id: # (test.t1)
-master-bin.000001	6091	Write_rows	1	6125	table_id: # flags: STMT_END_F
-master-bin.000001	6125	Table_map	1	6166	table_id: # (test.t1)
-master-bin.000001	6166	Write_rows	1	6200	table_id: # flags: STMT_END_F
-master-bin.000001	6200	Table_map	1	6241	table_id: # (test.t1)
-master-bin.000001	6241	Write_rows	1	6275	table_id: # flags: STMT_END_F
-master-bin.000001	6275	Table_map	1	6316	table_id: # (test.t1)
-master-bin.000001	6316	Write_rows	1	6350	table_id: # flags: STMT_END_F
-master-bin.000001	6350	Table_map	1	6391	table_id: # (test.t1)
-master-bin.000001	6391	Write_rows	1	6425	table_id: # flags: STMT_END_F
-master-bin.000001	6425	Table_map	1	6466	table_id: # (test.t1)
-master-bin.000001	6466	Write_rows	1	6500	table_id: # flags: STMT_END_F
-master-bin.000001	6500	Table_map	1	6541	table_id: # (test.t1)
-master-bin.000001	6541	Write_rows	1	6575	table_id: # flags: STMT_END_F
-master-bin.000001	6575	Table_map	1	6616	table_id: # (test.t1)
-master-bin.000001	6616	Write_rows	1	6650	table_id: # flags: STMT_END_F
-master-bin.000001	6650	Table_map	1	6691	table_id: # (test.t1)
-master-bin.000001	6691	Write_rows	1	6725	table_id: # flags: STMT_END_F
-master-bin.000001	6725	Table_map	1	6766	table_id: # (test.t1)
-master-bin.000001	6766	Write_rows	1	6800	table_id: # flags: STMT_END_F
-master-bin.000001	6800	Table_map	1	6841	table_id: # (test.t1)
-master-bin.000001	6841	Write_rows	1	6875	table_id: # flags: STMT_END_F
-master-bin.000001	6875	Table_map	1	6916	table_id: # (test.t1)
-master-bin.000001	6916	Write_rows	1	6950	table_id: # flags: STMT_END_F
-master-bin.000001	6950	Table_map	1	6991	table_id: # (test.t1)
-master-bin.000001	6991	Write_rows	1	7025	table_id: # flags: STMT_END_F
-master-bin.000001	7025	Table_map	1	7066	table_id: # (test.t1)
-master-bin.000001	7066	Write_rows	1	7100	table_id: # flags: STMT_END_F
-master-bin.000001	7100	Table_map	1	7141	table_id: # (test.t1)
-master-bin.000001	7141	Write_rows	1	7175	table_id: # flags: STMT_END_F
-master-bin.000001	7175	Table_map	1	7216	table_id: # (test.t1)
-master-bin.000001	7216	Write_rows	1	7250	table_id: # flags: STMT_END_F
-master-bin.000001	7250	Table_map	1	7291	table_id: # (test.t1)
-master-bin.000001	7291	Write_rows	1	7325	table_id: # flags: STMT_END_F
-master-bin.000001	7325	Table_map	1	7366	table_id: # (test.t1)
-master-bin.000001	7366	Write_rows	1	7400	table_id: # flags: STMT_END_F
-master-bin.000001	7400	Table_map	1	7441	table_id: # (test.t1)
-master-bin.000001	7441	Write_rows	1	7475	table_id: # flags: STMT_END_F
-master-bin.000001	7475	Table_map	1	7516	table_id: # (test.t1)
-master-bin.000001	7516	Write_rows	1	7550	table_id: # flags: STMT_END_F
-master-bin.000001	7550	Table_map	1	7591	table_id: # (test.t1)
-master-bin.000001	7591	Write_rows	1	7625	table_id: # flags: STMT_END_F
-master-bin.000001	7625	Table_map	1	7666	table_id: # (test.t1)
-master-bin.000001	7666	Write_rows	1	7700	table_id: # flags: STMT_END_F
-master-bin.000001	7700	Table_map	1	7741	table_id: # (test.t1)
-master-bin.000001	7741	Write_rows	1	7775	table_id: # flags: STMT_END_F
-master-bin.000001	7775	Table_map	1	7816	table_id: # (test.t1)
-master-bin.000001	7816	Write_rows	1	7850	table_id: # flags: STMT_END_F
-master-bin.000001	7850	Table_map	1	7891	table_id: # (test.t1)
-master-bin.000001	7891	Write_rows	1	7925	table_id: # flags: STMT_END_F
-master-bin.000001	7925	Table_map	1	7966	table_id: # (test.t1)
-master-bin.000001	7966	Write_rows	1	8000	table_id: # flags: STMT_END_F
-master-bin.000001	8000	Table_map	1	8041	table_id: # (test.t1)
-master-bin.000001	8041	Write_rows	1	8075	table_id: # flags: STMT_END_F
-master-bin.000001	8075	Table_map	1	8116	table_id: # (test.t1)
-master-bin.000001	8116	Write_rows	1	8150	table_id: # flags: STMT_END_F
-master-bin.000001	8150	Table_map	1	8191	table_id: # (test.t1)
-master-bin.000001	8191	Write_rows	1	8225	table_id: # flags: STMT_END_F
-master-bin.000001	8225	Table_map	1	8266	table_id: # (test.t1)
-master-bin.000001	8266	Write_rows	1	8300	table_id: # flags: STMT_END_F
-master-bin.000001	8300	Table_map	1	8341	table_id: # (test.t1)
-master-bin.000001	8341	Write_rows	1	8375	table_id: # flags: STMT_END_F
-master-bin.000001	8375	Table_map	1	8416	table_id: # (test.t1)
-master-bin.000001	8416	Write_rows	1	8450	table_id: # flags: STMT_END_F
-master-bin.000001	8450	Table_map	1	8491	table_id: # (test.t1)
-master-bin.000001	8491	Write_rows	1	8525	table_id: # flags: STMT_END_F
-master-bin.000001	8525	Table_map	1	8566	table_id: # (test.t1)
-master-bin.000001	8566	Write_rows	1	8600	table_id: # flags: STMT_END_F
-master-bin.000001	8600	Table_map	1	8641	table_id: # (test.t1)
-master-bin.000001	8641	Write_rows	1	8675	table_id: # flags: STMT_END_F
-master-bin.000001	8675	Table_map	1	8716	table_id: # (test.t1)
-master-bin.000001	8716	Write_rows	1	8750	table_id: # flags: STMT_END_F
-master-bin.000001	8750	Table_map	1	8791	table_id: # (test.t1)
-master-bin.000001	8791	Write_rows	1	8825	table_id: # flags: STMT_END_F
-master-bin.000001	8825	Table_map	1	8866	table_id: # (test.t1)
-master-bin.000001	8866	Write_rows	1	8900	table_id: # flags: STMT_END_F
-master-bin.000001	8900	Table_map	1	8941	table_id: # (test.t1)
-master-bin.000001	8941	Write_rows	1	8975	table_id: # flags: STMT_END_F
-master-bin.000001	8975	Table_map	1	9016	table_id: # (test.t1)
-master-bin.000001	9016	Write_rows	1	9050	table_id: # flags: STMT_END_F
-master-bin.000001	9050	Table_map	1	9091	table_id: # (test.t1)
-master-bin.000001	9091	Write_rows	1	9125	table_id: # flags: STMT_END_F
-master-bin.000001	9125	Table_map	1	9166	table_id: # (test.t1)
-master-bin.000001	9166	Write_rows	1	9200	table_id: # flags: STMT_END_F
-master-bin.000001	9200	Table_map	1	9241	table_id: # (test.t1)
-master-bin.000001	9241	Write_rows	1	9275	table_id: # flags: STMT_END_F
-master-bin.000001	9275	Table_map	1	9316	table_id: # (test.t1)
-master-bin.000001	9316	Write_rows	1	9350	table_id: # flags: STMT_END_F
-master-bin.000001	9350	Table_map	1	9391	table_id: # (test.t1)
-master-bin.000001	9391	Write_rows	1	9425	table_id: # flags: STMT_END_F
-master-bin.000001	9425	Table_map	1	9466	table_id: # (test.t1)
-master-bin.000001	9466	Write_rows	1	9500	table_id: # flags: STMT_END_F
-master-bin.000001	9500	Table_map	1	9541	table_id: # (test.t1)
-master-bin.000001	9541	Write_rows	1	9575	table_id: # flags: STMT_END_F
-master-bin.000001	9575	Table_map	1	9616	table_id: # (test.t1)
-master-bin.000001	9616	Write_rows	1	9650	table_id: # flags: STMT_END_F
-master-bin.000001	9650	Table_map	1	9691	table_id: # (test.t1)
-master-bin.000001	9691	Write_rows	1	9725	table_id: # flags: STMT_END_F
-master-bin.000001	9725	Table_map	1	9766	table_id: # (test.t1)
-master-bin.000001	9766	Write_rows	1	9800	table_id: # flags: STMT_END_F
-master-bin.000001	9800	Table_map	1	9841	table_id: # (test.t1)
-master-bin.000001	9841	Write_rows	1	9875	table_id: # flags: STMT_END_F
-master-bin.000001	9875	Table_map	1	9916	table_id: # (test.t1)
-master-bin.000001	9916	Write_rows	1	9950	table_id: # flags: STMT_END_F
-master-bin.000001	9950	Table_map	1	9991	table_id: # (test.t1)
-master-bin.000001	9991	Write_rows	1	10025	table_id: # flags: STMT_END_F
-master-bin.000001	10025	Table_map	1	10066	table_id: # (test.t1)
-master-bin.000001	10066	Write_rows	1	10100	table_id: # flags: STMT_END_F
-master-bin.000001	10100	Table_map	1	10141	table_id: # (test.t1)
-master-bin.000001	10141	Write_rows	1	10175	table_id: # flags: STMT_END_F
-master-bin.000001	10175	Table_map	1	10216	table_id: # (test.t1)
-master-bin.000001	10216	Write_rows	1	10250	table_id: # flags: STMT_END_F
-master-bin.000001	10250	Table_map	1	10291	table_id: # (test.t1)
-master-bin.000001	10291	Write_rows	1	10325	table_id: # flags: STMT_END_F
-master-bin.000001	10325	Table_map	1	10366	table_id: # (test.t1)
-master-bin.000001	10366	Write_rows	1	10400	table_id: # flags: STMT_END_F
-master-bin.000001	10400	Table_map	1	10441	table_id: # (test.t1)
-master-bin.000001	10441	Write_rows	1	10475	table_id: # flags: STMT_END_F
-master-bin.000001	10475	Table_map	1	10516	table_id: # (test.t1)
-master-bin.000001	10516	Write_rows	1	10550	table_id: # flags: STMT_END_F
-master-bin.000001	10550	Table_map	1	10591	table_id: # (test.t1)
-master-bin.000001	10591	Write_rows	1	10625	table_id: # flags: STMT_END_F
-master-bin.000001	10625	Table_map	1	10666	table_id: # (test.t1)
-master-bin.000001	10666	Write_rows	1	10700	table_id: # flags: STMT_END_F
-master-bin.000001	10700	Table_map	1	10741	table_id: # (test.t1)
-master-bin.000001	10741	Write_rows	1	10775	table_id: # flags: STMT_END_F
-master-bin.000001	10775	Table_map	1	10816	table_id: # (test.t1)
-master-bin.000001	10816	Write_rows	1	10850	table_id: # flags: STMT_END_F
-master-bin.000001	10850	Table_map	1	10891	table_id: # (test.t1)
-master-bin.000001	10891	Write_rows	1	10925	table_id: # flags: STMT_END_F
-master-bin.000001	10925	Table_map	1	10966	table_id: # (test.t1)
-master-bin.000001	10966	Write_rows	1	11000	table_id: # flags: STMT_END_F
-master-bin.000001	11000	Table_map	1	11041	table_id: # (test.t1)
-master-bin.000001	11041	Write_rows	1	11075	table_id: # flags: STMT_END_F
-master-bin.000001	11075	Table_map	1	11116	table_id: # (test.t1)
-master-bin.000001	11116	Write_rows	1	11150	table_id: # flags: STMT_END_F
-master-bin.000001	11150	Table_map	1	11191	table_id: # (test.t1)
-master-bin.000001	11191	Write_rows	1	11225	table_id: # flags: STMT_END_F
-master-bin.000001	11225	Table_map	1	11266	table_id: # (test.t1)
-master-bin.000001	11266	Write_rows	1	11300	table_id: # flags: STMT_END_F
-master-bin.000001	11300	Table_map	1	11341	table_id: # (test.t1)
-master-bin.000001	11341	Write_rows	1	11375	table_id: # flags: STMT_END_F
-master-bin.000001	11375	Table_map	1	11416	table_id: # (test.t1)
-master-bin.000001	11416	Write_rows	1	11450	table_id: # flags: STMT_END_F
-master-bin.000001	11450	Table_map	1	11491	table_id: # (test.t1)
-master-bin.000001	11491	Write_rows	1	11525	table_id: # flags: STMT_END_F
-master-bin.000001	11525	Table_map	1	11566	table_id: # (test.t1)
-master-bin.000001	11566	Write_rows	1	11600	table_id: # flags: STMT_END_F
-master-bin.000001	11600	Table_map	1	11641	table_id: # (test.t1)
-master-bin.000001	11641	Write_rows	1	11675	table_id: # flags: STMT_END_F
-master-bin.000001	11675	Table_map	1	11716	table_id: # (test.t1)
-master-bin.000001	11716	Write_rows	1	11750	table_id: # flags: STMT_END_F
-master-bin.000001	11750	Table_map	1	11791	table_id: # (test.t1)
-master-bin.000001	11791	Write_rows	1	11825	table_id: # flags: STMT_END_F
-master-bin.000001	11825	Table_map	1	11866	table_id: # (test.t1)
-master-bin.000001	11866	Write_rows	1	11900	table_id: # flags: STMT_END_F
-master-bin.000001	11900	Table_map	1	11941	table_id: # (test.t1)
-master-bin.000001	11941	Write_rows	1	11975	table_id: # flags: STMT_END_F
-master-bin.000001	11975	Table_map	1	12016	table_id: # (test.t1)
-master-bin.000001	12016	Write_rows	1	12050	table_id: # flags: STMT_END_F
-master-bin.000001	12050	Table_map	1	12091	table_id: # (test.t1)
-master-bin.000001	12091	Write_rows	1	12125	table_id: # flags: STMT_END_F
-master-bin.000001	12125	Table_map	1	12166	table_id: # (test.t1)
-master-bin.000001	12166	Write_rows	1	12200	table_id: # flags: STMT_END_F
-master-bin.000001	12200	Table_map	1	12241	table_id: # (test.t1)
-master-bin.000001	12241	Write_rows	1	12275	table_id: # flags: STMT_END_F
-master-bin.000001	12275	Table_map	1	12316	table_id: # (test.t1)
-master-bin.000001	12316	Write_rows	1	12350	table_id: # flags: STMT_END_F
-master-bin.000001	12350	Table_map	1	12391	table_id: # (test.t1)
-master-bin.000001	12391	Write_rows	1	12425	table_id: # flags: STMT_END_F
-master-bin.000001	12425	Table_map	1	12466	table_id: # (test.t1)
-master-bin.000001	12466	Write_rows	1	12500	table_id: # flags: STMT_END_F
-master-bin.000001	12500	Table_map	1	12541	table_id: # (test.t1)
-master-bin.000001	12541	Write_rows	1	12575	table_id: # flags: STMT_END_F
-master-bin.000001	12575	Table_map	1	12616	table_id: # (test.t1)
-master-bin.000001	12616	Write_rows	1	12650	table_id: # flags: STMT_END_F
-master-bin.000001	12650	Table_map	1	12691	table_id: # (test.t1)
-master-bin.000001	12691	Write_rows	1	12725	table_id: # flags: STMT_END_F
-master-bin.000001	12725	Table_map	1	12766	table_id: # (test.t1)
-master-bin.000001	12766	Write_rows	1	12800	table_id: # flags: STMT_END_F
-master-bin.000001	12800	Table_map	1	12841	table_id: # (test.t1)
-master-bin.000001	12841	Write_rows	1	12875	table_id: # flags: STMT_END_F
-master-bin.000001	12875	Table_map	1	12916	table_id: # (test.t1)
-master-bin.000001	12916	Write_rows	1	12950	table_id: # flags: STMT_END_F
-master-bin.000001	12950	Table_map	1	12991	table_id: # (test.t1)
-master-bin.000001	12991	Write_rows	1	13025	table_id: # flags: STMT_END_F
-master-bin.000001	13025	Table_map	1	13066	table_id: # (test.t1)
-master-bin.000001	13066	Write_rows	1	13100	table_id: # flags: STMT_END_F
-master-bin.000001	13100	Table_map	1	13141	table_id: # (test.t1)
-master-bin.000001	13141	Write_rows	1	13175	table_id: # flags: STMT_END_F
-master-bin.000001	13175	Table_map	1	13216	table_id: # (test.t1)
-master-bin.000001	13216	Write_rows	1	13250	table_id: # flags: STMT_END_F
-master-bin.000001	13250	Table_map	1	13291	table_id: # (test.t1)
-master-bin.000001	13291	Write_rows	1	13325	table_id: # flags: STMT_END_F
-master-bin.000001	13325	Table_map	1	13366	table_id: # (test.t1)
-master-bin.000001	13366	Write_rows	1	13400	table_id: # flags: STMT_END_F
-master-bin.000001	13400	Table_map	1	13441	table_id: # (test.t1)
-master-bin.000001	13441	Write_rows	1	13475	table_id: # flags: STMT_END_F
-master-bin.000001	13475	Table_map	1	13516	table_id: # (test.t1)
-master-bin.000001	13516	Write_rows	1	13550	table_id: # flags: STMT_END_F
-master-bin.000001	13550	Table_map	1	13591	table_id: # (test.t1)
-master-bin.000001	13591	Write_rows	1	13625	table_id: # flags: STMT_END_F
-master-bin.000001	13625	Table_map	1	13666	table_id: # (test.t1)
-master-bin.000001	13666	Write_rows	1	13700	table_id: # flags: STMT_END_F
-master-bin.000001	13700	Table_map	1	13741	table_id: # (test.t1)
-master-bin.000001	13741	Write_rows	1	13775	table_id: # flags: STMT_END_F
-master-bin.000001	13775	Table_map	1	13816	table_id: # (test.t1)
-master-bin.000001	13816	Write_rows	1	13850	table_id: # flags: STMT_END_F
-master-bin.000001	13850	Table_map	1	13891	table_id: # (test.t1)
-master-bin.000001	13891	Write_rows	1	13925	table_id: # flags: STMT_END_F
-master-bin.000001	13925	Table_map	1	13966	table_id: # (test.t1)
-master-bin.000001	13966	Write_rows	1	14000	table_id: # flags: STMT_END_F
-master-bin.000001	14000	Table_map	1	14041	table_id: # (test.t1)
-master-bin.000001	14041	Write_rows	1	14075	table_id: # flags: STMT_END_F
-master-bin.000001	14075	Table_map	1	14116	table_id: # (test.t1)
-master-bin.000001	14116	Write_rows	1	14150	table_id: # flags: STMT_END_F
-master-bin.000001	14150	Table_map	1	14191	table_id: # (test.t1)
-master-bin.000001	14191	Write_rows	1	14225	table_id: # flags: STMT_END_F
-master-bin.000001	14225	Table_map	1	14266	table_id: # (test.t1)
-master-bin.000001	14266	Write_rows	1	14300	table_id: # flags: STMT_END_F
-master-bin.000001	14300	Table_map	1	14341	table_id: # (test.t1)
-master-bin.000001	14341	Write_rows	1	14375	table_id: # flags: STMT_END_F
-master-bin.000001	14375	Table_map	1	14416	table_id: # (test.t1)
-master-bin.000001	14416	Write_rows	1	14450	table_id: # flags: STMT_END_F
-master-bin.000001	14450	Table_map	1	14491	table_id: # (test.t1)
-master-bin.000001	14491	Write_rows	1	14525	table_id: # flags: STMT_END_F
-master-bin.000001	14525	Table_map	1	14566	table_id: # (test.t1)
-master-bin.000001	14566	Write_rows	1	14600	table_id: # flags: STMT_END_F
-master-bin.000001	14600	Table_map	1	14641	table_id: # (test.t1)
-master-bin.000001	14641	Write_rows	1	14675	table_id: # flags: STMT_END_F
-master-bin.000001	14675	Table_map	1	14716	table_id: # (test.t1)
-master-bin.000001	14716	Write_rows	1	14750	table_id: # flags: STMT_END_F
-master-bin.000001	14750	Table_map	1	14791	table_id: # (test.t1)
-master-bin.000001	14791	Write_rows	1	14825	table_id: # flags: STMT_END_F
-master-bin.000001	14825	Table_map	1	14866	table_id: # (test.t1)
-master-bin.000001	14866	Write_rows	1	14900	table_id: # flags: STMT_END_F
-master-bin.000001	14900	Table_map	1	14941	table_id: # (test.t1)
-master-bin.000001	14941	Write_rows	1	14975	table_id: # flags: STMT_END_F
-master-bin.000001	14975	Table_map	1	15016	table_id: # (test.t1)
-master-bin.000001	15016	Write_rows	1	15050	table_id: # flags: STMT_END_F
-master-bin.000001	15050	Table_map	1	15091	table_id: # (test.t1)
-master-bin.000001	15091	Write_rows	1	15125	table_id: # flags: STMT_END_F
-master-bin.000001	15125	Table_map	1	15166	table_id: # (test.t1)
-master-bin.000001	15166	Write_rows	1	15200	table_id: # flags: STMT_END_F
-master-bin.000001	15200	Table_map	1	15241	table_id: # (test.t1)
-master-bin.000001	15241	Write_rows	1	15275	table_id: # flags: STMT_END_F
-master-bin.000001	15275	Table_map	1	15316	table_id: # (test.t1)
-master-bin.000001	15316	Write_rows	1	15350	table_id: # flags: STMT_END_F
-master-bin.000001	15350	Table_map	1	15391	table_id: # (test.t1)
-master-bin.000001	15391	Write_rows	1	15425	table_id: # flags: STMT_END_F
-master-bin.000001	15425	Table_map	1	15466	table_id: # (test.t1)
-master-bin.000001	15466	Write_rows	1	15500	table_id: # flags: STMT_END_F
-master-bin.000001	15500	Table_map	1	15541	table_id: # (test.t1)
-master-bin.000001	15541	Write_rows	1	15575	table_id: # flags: STMT_END_F
-master-bin.000001	15575	Table_map	1	15616	table_id: # (test.t1)
-master-bin.000001	15616	Write_rows	1	15650	table_id: # flags: STMT_END_F
-master-bin.000001	15650	Table_map	1	15691	table_id: # (test.t1)
-master-bin.000001	15691	Write_rows	1	15725	table_id: # flags: STMT_END_F
-master-bin.000001	15725	Table_map	1	15766	table_id: # (test.t1)
-master-bin.000001	15766	Write_rows	1	15800	table_id: # flags: STMT_END_F
-master-bin.000001	15800	Table_map	1	15841	table_id: # (test.t1)
-master-bin.000001	15841	Write_rows	1	15875	table_id: # flags: STMT_END_F
-master-bin.000001	15875	Table_map	1	15916	table_id: # (test.t1)
-master-bin.000001	15916	Write_rows	1	15950	table_id: # flags: STMT_END_F
-master-bin.000001	15950	Table_map	1	15991	table_id: # (test.t1)
-master-bin.000001	15991	Write_rows	1	16025	table_id: # flags: STMT_END_F
-master-bin.000001	16025	Table_map	1	16066	table_id: # (test.t1)
-master-bin.000001	16066	Write_rows	1	16100	table_id: # flags: STMT_END_F
-master-bin.000001	16100	Table_map	1	16141	table_id: # (test.t1)
-master-bin.000001	16141	Write_rows	1	16175	table_id: # flags: STMT_END_F
-master-bin.000001	16175	Table_map	1	16216	table_id: # (test.t1)
-master-bin.000001	16216	Write_rows	1	16250	table_id: # flags: STMT_END_F
-master-bin.000001	16250	Table_map	1	16291	table_id: # (test.t1)
-master-bin.000001	16291	Write_rows	1	16325	table_id: # flags: STMT_END_F
-master-bin.000001	16325	Table_map	1	16366	table_id: # (test.t1)
-master-bin.000001	16366	Write_rows	1	16400	table_id: # flags: STMT_END_F
-master-bin.000001	16400	Table_map	1	16441	table_id: # (test.t1)
-master-bin.000001	16441	Write_rows	1	16475	table_id: # flags: STMT_END_F
-master-bin.000001	16475	Table_map	1	16516	table_id: # (test.t1)
-master-bin.000001	16516	Write_rows	1	16550	table_id: # flags: STMT_END_F
-master-bin.000001	16550	Table_map	1	16591	table_id: # (test.t1)
-master-bin.000001	16591	Write_rows	1	16625	table_id: # flags: STMT_END_F
-master-bin.000001	16625	Table_map	1	16666	table_id: # (test.t1)
-master-bin.000001	16666	Write_rows	1	16700	table_id: # flags: STMT_END_F
-master-bin.000001	16700	Table_map	1	16741	table_id: # (test.t1)
-master-bin.000001	16741	Write_rows	1	16775	table_id: # flags: STMT_END_F
-master-bin.000001	16775	Table_map	1	16816	table_id: # (test.t1)
-master-bin.000001	16816	Write_rows	1	16850	table_id: # flags: STMT_END_F
-master-bin.000001	16850	Table_map	1	16891	table_id: # (test.t1)
-master-bin.000001	16891	Write_rows	1	16925	table_id: # flags: STMT_END_F
-master-bin.000001	16925	Table_map	1	16966	table_id: # (test.t1)
-master-bin.000001	16966	Write_rows	1	17000	table_id: # flags: STMT_END_F
-master-bin.000001	17000	Table_map	1	17041	table_id: # (test.t1)
-master-bin.000001	17041	Write_rows	1	17075	table_id: # flags: STMT_END_F
-master-bin.000001	17075	Table_map	1	17116	table_id: # (test.t1)
-master-bin.000001	17116	Write_rows	1	17150	table_id: # flags: STMT_END_F
-master-bin.000001	17150	Table_map	1	17191	table_id: # (test.t1)
-master-bin.000001	17191	Write_rows	1	17225	table_id: # flags: STMT_END_F
-master-bin.000001	17225	Table_map	1	17266	table_id: # (test.t1)
-master-bin.000001	17266	Write_rows	1	17300	table_id: # flags: STMT_END_F
-master-bin.000001	17300	Table_map	1	17341	table_id: # (test.t1)
-master-bin.000001	17341	Write_rows	1	17375	table_id: # flags: STMT_END_F
-master-bin.000001	17375	Table_map	1	17416	table_id: # (test.t1)
-master-bin.000001	17416	Write_rows	1	17450	table_id: # flags: STMT_END_F
-master-bin.000001	17450	Table_map	1	17491	table_id: # (test.t1)
-master-bin.000001	17491	Write_rows	1	17525	table_id: # flags: STMT_END_F
-master-bin.000001	17525	Table_map	1	17566	table_id: # (test.t1)
-master-bin.000001	17566	Write_rows	1	17600	table_id: # flags: STMT_END_F
-master-bin.000001	17600	Table_map	1	17641	table_id: # (test.t1)
-master-bin.000001	17641	Write_rows	1	17675	table_id: # flags: STMT_END_F
-master-bin.000001	17675	Table_map	1	17716	table_id: # (test.t1)
-master-bin.000001	17716	Write_rows	1	17750	table_id: # flags: STMT_END_F
-master-bin.000001	17750	Table_map	1	17791	table_id: # (test.t1)
-master-bin.000001	17791	Write_rows	1	17825	table_id: # flags: STMT_END_F
-master-bin.000001	17825	Table_map	1	17866	table_id: # (test.t1)
-master-bin.000001	17866	Write_rows	1	17900	table_id: # flags: STMT_END_F
-master-bin.000001	17900	Table_map	1	17941	table_id: # (test.t1)
-master-bin.000001	17941	Write_rows	1	17975	table_id: # flags: STMT_END_F
-master-bin.000001	17975	Table_map	1	18016	table_id: # (test.t1)
-master-bin.000001	18016	Write_rows	1	18050	table_id: # flags: STMT_END_F
-master-bin.000001	18050	Table_map	1	18091	table_id: # (test.t1)
-master-bin.000001	18091	Write_rows	1	18125	table_id: # flags: STMT_END_F
-master-bin.000001	18125	Table_map	1	18166	table_id: # (test.t1)
-master-bin.000001	18166	Write_rows	1	18200	table_id: # flags: STMT_END_F
-master-bin.000001	18200	Table_map	1	18241	table_id: # (test.t1)
-master-bin.000001	18241	Write_rows	1	18275	table_id: # flags: STMT_END_F
-master-bin.000001	18275	Table_map	1	18316	table_id: # (test.t1)
-master-bin.000001	18316	Write_rows	1	18350	table_id: # flags: STMT_END_F
-master-bin.000001	18350	Table_map	1	18391	table_id: # (test.t1)
-master-bin.000001	18391	Write_rows	1	18425	table_id: # flags: STMT_END_F
-master-bin.000001	18425	Table_map	1	18466	table_id: # (test.t1)
-master-bin.000001	18466	Write_rows	1	18500	table_id: # flags: STMT_END_F
-master-bin.000001	18500	Table_map	1	18541	table_id: # (test.t1)
-master-bin.000001	18541	Write_rows	1	18575	table_id: # flags: STMT_END_F
-master-bin.000001	18575	Table_map	1	18616	table_id: # (test.t1)
-master-bin.000001	18616	Write_rows	1	18650	table_id: # flags: STMT_END_F
-master-bin.000001	18650	Table_map	1	18691	table_id: # (test.t1)
-master-bin.000001	18691	Write_rows	1	18725	table_id: # flags: STMT_END_F
-master-bin.000001	18725	Table_map	1	18766	table_id: # (test.t1)
-master-bin.000001	18766	Write_rows	1	18800	table_id: # flags: STMT_END_F
-master-bin.000001	18800	Table_map	1	18841	table_id: # (test.t1)
-master-bin.000001	18841	Write_rows	1	18875	table_id: # flags: STMT_END_F
-master-bin.000001	18875	Table_map	1	18916	table_id: # (test.t1)
-master-bin.000001	18916	Write_rows	1	18950	table_id: # flags: STMT_END_F
-master-bin.000001	18950	Table_map	1	18991	table_id: # (test.t1)
-master-bin.000001	18991	Write_rows	1	19025	table_id: # flags: STMT_END_F
-master-bin.000001	19025	Table_map	1	19066	table_id: # (test.t1)
-master-bin.000001	19066	Write_rows	1	19100	table_id: # flags: STMT_END_F
-master-bin.000001	19100	Table_map	1	19141	table_id: # (test.t1)
-master-bin.000001	19141	Write_rows	1	19175	table_id: # flags: STMT_END_F
-master-bin.000001	19175	Table_map	1	19216	table_id: # (test.t1)
-master-bin.000001	19216	Write_rows	1	19250	table_id: # flags: STMT_END_F
-master-bin.000001	19250	Table_map	1	19291	table_id: # (test.t1)
-master-bin.000001	19291	Write_rows	1	19325	table_id: # flags: STMT_END_F
-master-bin.000001	19325	Table_map	1	19366	table_id: # (test.t1)
-master-bin.000001	19366	Write_rows	1	19400	table_id: # flags: STMT_END_F
-master-bin.000001	19400	Table_map	1	19441	table_id: # (test.t1)
-master-bin.000001	19441	Write_rows	1	19475	table_id: # flags: STMT_END_F
-master-bin.000001	19475	Table_map	1	19516	table_id: # (test.t1)
-master-bin.000001	19516	Write_rows	1	19550	table_id: # flags: STMT_END_F
-master-bin.000001	19550	Table_map	1	19591	table_id: # (test.t1)
-master-bin.000001	19591	Write_rows	1	19625	table_id: # flags: STMT_END_F
-master-bin.000001	19625	Table_map	1	19666	table_id: # (test.t1)
-master-bin.000001	19666	Write_rows	1	19700	table_id: # flags: STMT_END_F
-master-bin.000001	19700	Table_map	1	19741	table_id: # (test.t1)
-master-bin.000001	19741	Write_rows	1	19775	table_id: # flags: STMT_END_F
-master-bin.000001	19775	Table_map	1	19816	table_id: # (test.t1)
-master-bin.000001	19816	Write_rows	1	19850	table_id: # flags: STMT_END_F
-master-bin.000001	19850	Table_map	1	19891	table_id: # (test.t1)
-master-bin.000001	19891	Write_rows	1	19925	table_id: # flags: STMT_END_F
-master-bin.000001	19925	Table_map	1	19966	table_id: # (test.t1)
-master-bin.000001	19966	Write_rows	1	20000	table_id: # flags: STMT_END_F
-master-bin.000001	20000	Table_map	1	20041	table_id: # (test.t1)
-master-bin.000001	20041	Write_rows	1	20075	table_id: # flags: STMT_END_F
-master-bin.000001	20075	Table_map	1	20116	table_id: # (test.t1)
-master-bin.000001	20116	Write_rows	1	20150	table_id: # flags: STMT_END_F
-master-bin.000001	20150	Table_map	1	20191	table_id: # (test.t1)
-master-bin.000001	20191	Write_rows	1	20225	table_id: # flags: STMT_END_F
-master-bin.000001	20225	Table_map	1	20266	table_id: # (test.t1)
-master-bin.000001	20266	Write_rows	1	20300	table_id: # flags: STMT_END_F
-master-bin.000001	20300	Table_map	1	20341	table_id: # (test.t1)
-master-bin.000001	20341	Write_rows	1	20375	table_id: # flags: STMT_END_F
-master-bin.000001	20375	Table_map	1	20416	table_id: # (test.t1)
-master-bin.000001	20416	Write_rows	1	20450	table_id: # flags: STMT_END_F
-master-bin.000001	20450	Table_map	1	20491	table_id: # (test.t1)
-master-bin.000001	20491	Write_rows	1	20525	table_id: # flags: STMT_END_F
-master-bin.000001	20525	Table_map	1	20566	table_id: # (test.t1)
-master-bin.000001	20566	Write_rows	1	20600	table_id: # flags: STMT_END_F
-master-bin.000001	20600	Table_map	1	20641	table_id: # (test.t1)
-master-bin.000001	20641	Write_rows	1	20675	table_id: # flags: STMT_END_F
-master-bin.000001	20675	Table_map	1	20716	table_id: # (test.t1)
-master-bin.000001	20716	Write_rows	1	20750	table_id: # flags: STMT_END_F
-master-bin.000001	20750	Table_map	1	20791	table_id: # (test.t1)
-master-bin.000001	20791	Write_rows	1	20825	table_id: # flags: STMT_END_F
-master-bin.000001	20825	Table_map	1	20866	table_id: # (test.t1)
-master-bin.000001	20866	Write_rows	1	20900	table_id: # flags: STMT_END_F
-master-bin.000001	20900	Table_map	1	20941	table_id: # (test.t1)
-master-bin.000001	20941	Write_rows	1	20975	table_id: # flags: STMT_END_F
-master-bin.000001	20975	Table_map	1	21016	table_id: # (test.t1)
-master-bin.000001	21016	Write_rows	1	21050	table_id: # flags: STMT_END_F
-master-bin.000001	21050	Table_map	1	21091	table_id: # (test.t1)
-master-bin.000001	21091	Write_rows	1	21125	table_id: # flags: STMT_END_F
-master-bin.000001	21125	Table_map	1	21166	table_id: # (test.t1)
-master-bin.000001	21166	Write_rows	1	21200	table_id: # flags: STMT_END_F
-master-bin.000001	21200	Table_map	1	21241	table_id: # (test.t1)
-master-bin.000001	21241	Write_rows	1	21275	table_id: # flags: STMT_END_F
-master-bin.000001	21275	Table_map	1	21316	table_id: # (test.t1)
-master-bin.000001	21316	Write_rows	1	21350	table_id: # flags: STMT_END_F
-master-bin.000001	21350	Table_map	1	21391	table_id: # (test.t1)
-master-bin.000001	21391	Write_rows	1	21425	table_id: # flags: STMT_END_F
-master-bin.000001	21425	Table_map	1	21466	table_id: # (test.t1)
-master-bin.000001	21466	Write_rows	1	21500	table_id: # flags: STMT_END_F
-master-bin.000001	21500	Table_map	1	21541	table_id: # (test.t1)
-master-bin.000001	21541	Write_rows	1	21575	table_id: # flags: STMT_END_F
-master-bin.000001	21575	Table_map	1	21616	table_id: # (test.t1)
-master-bin.000001	21616	Write_rows	1	21650	table_id: # flags: STMT_END_F
-master-bin.000001	21650	Table_map	1	21691	table_id: # (test.t1)
-master-bin.000001	21691	Write_rows	1	21725	table_id: # flags: STMT_END_F
-master-bin.000001	21725	Table_map	1	21766	table_id: # (test.t1)
-master-bin.000001	21766	Write_rows	1	21800	table_id: # flags: STMT_END_F
-master-bin.000001	21800	Table_map	1	21841	table_id: # (test.t1)
-master-bin.000001	21841	Write_rows	1	21875	table_id: # flags: STMT_END_F
-master-bin.000001	21875	Table_map	1	21916	table_id: # (test.t1)
-master-bin.000001	21916	Write_rows	1	21950	table_id: # flags: STMT_END_F
-master-bin.000001	21950	Table_map	1	21991	table_id: # (test.t1)
-master-bin.000001	21991	Write_rows	1	22025	table_id: # flags: STMT_END_F
-master-bin.000001	22025	Table_map	1	22066	table_id: # (test.t1)
-master-bin.000001	22066	Write_rows	1	22100	table_id: # flags: STMT_END_F
-master-bin.000001	22100	Table_map	1	22141	table_id: # (test.t1)
-master-bin.000001	22141	Write_rows	1	22175	table_id: # flags: STMT_END_F
-master-bin.000001	22175	Table_map	1	22216	table_id: # (test.t1)
-master-bin.000001	22216	Write_rows	1	22250	table_id: # flags: STMT_END_F
-master-bin.000001	22250	Table_map	1	22291	table_id: # (test.t1)
-master-bin.000001	22291	Write_rows	1	22325	table_id: # flags: STMT_END_F
-master-bin.000001	22325	Table_map	1	22366	table_id: # (test.t1)
-master-bin.000001	22366	Write_rows	1	22400	table_id: # flags: STMT_END_F
-master-bin.000001	22400	Table_map	1	22441	table_id: # (test.t1)
-master-bin.000001	22441	Write_rows	1	22475	table_id: # flags: STMT_END_F
-master-bin.000001	22475	Table_map	1	22516	table_id: # (test.t1)
-master-bin.000001	22516	Write_rows	1	22550	table_id: # flags: STMT_END_F
-master-bin.000001	22550	Table_map	1	22591	table_id: # (test.t1)
-master-bin.000001	22591	Write_rows	1	22625	table_id: # flags: STMT_END_F
-master-bin.000001	22625	Table_map	1	22666	table_id: # (test.t1)
-master-bin.000001	22666	Write_rows	1	22700	table_id: # flags: STMT_END_F
-master-bin.000001	22700	Table_map	1	22741	table_id: # (test.t1)
-master-bin.000001	22741	Write_rows	1	22775	table_id: # flags: STMT_END_F
-master-bin.000001	22775	Table_map	1	22816	table_id: # (test.t1)
-master-bin.000001	22816	Write_rows	1	22850	table_id: # flags: STMT_END_F
-master-bin.000001	22850	Table_map	1	22891	table_id: # (test.t1)
-master-bin.000001	22891	Write_rows	1	22925	table_id: # flags: STMT_END_F
-master-bin.000001	22925	Table_map	1	22966	table_id: # (test.t1)
-master-bin.000001	22966	Write_rows	1	23000	table_id: # flags: STMT_END_F
-master-bin.000001	23000	Table_map	1	23041	table_id: # (test.t1)
-master-bin.000001	23041	Write_rows	1	23075	table_id: # flags: STMT_END_F
-master-bin.000001	23075	Table_map	1	23116	table_id: # (test.t1)
-master-bin.000001	23116	Write_rows	1	23150	table_id: # flags: STMT_END_F
-master-bin.000001	23150	Table_map	1	23191	table_id: # (test.t1)
-master-bin.000001	23191	Write_rows	1	23225	table_id: # flags: STMT_END_F
-master-bin.000001	23225	Table_map	1	23266	table_id: # (test.t1)
-master-bin.000001	23266	Write_rows	1	23300	table_id: # flags: STMT_END_F
-master-bin.000001	23300	Table_map	1	23341	table_id: # (test.t1)
-master-bin.000001	23341	Write_rows	1	23375	table_id: # flags: STMT_END_F
-master-bin.000001	23375	Table_map	1	23416	table_id: # (test.t1)
-master-bin.000001	23416	Write_rows	1	23450	table_id: # flags: STMT_END_F
-master-bin.000001	23450	Table_map	1	23491	table_id: # (test.t1)
-master-bin.000001	23491	Write_rows	1	23525	table_id: # flags: STMT_END_F
-master-bin.000001	23525	Table_map	1	23566	table_id: # (test.t1)
-master-bin.000001	23566	Write_rows	1	23600	table_id: # flags: STMT_END_F
-master-bin.000001	23600	Table_map	1	23641	table_id: # (test.t1)
-master-bin.000001	23641	Write_rows	1	23675	table_id: # flags: STMT_END_F
-master-bin.000001	23675	Table_map	1	23716	table_id: # (test.t1)
-master-bin.000001	23716	Write_rows	1	23750	table_id: # flags: STMT_END_F
-master-bin.000001	23750	Table_map	1	23791	table_id: # (test.t1)
-master-bin.000001	23791	Write_rows	1	23825	table_id: # flags: STMT_END_F
-master-bin.000001	23825	Table_map	1	23866	table_id: # (test.t1)
-master-bin.000001	23866	Write_rows	1	23900	table_id: # flags: STMT_END_F
-master-bin.000001	23900	Table_map	1	23941	table_id: # (test.t1)
-master-bin.000001	23941	Write_rows	1	23975	table_id: # flags: STMT_END_F
-master-bin.000001	23975	Table_map	1	24016	table_id: # (test.t1)
-master-bin.000001	24016	Write_rows	1	24050	table_id: # flags: STMT_END_F
-master-bin.000001	24050	Table_map	1	24091	table_id: # (test.t1)
-master-bin.000001	24091	Write_rows	1	24125	table_id: # flags: STMT_END_F
-master-bin.000001	24125	Table_map	1	24166	table_id: # (test.t1)
-master-bin.000001	24166	Write_rows	1	24200	table_id: # flags: STMT_END_F
-master-bin.000001	24200	Table_map	1	24241	table_id: # (test.t1)
-master-bin.000001	24241	Write_rows	1	24275	table_id: # flags: STMT_END_F
-master-bin.000001	24275	Table_map	1	24316	table_id: # (test.t1)
-master-bin.000001	24316	Write_rows	1	24350	table_id: # flags: STMT_END_F
-master-bin.000001	24350	Table_map	1	24391	table_id: # (test.t1)
-master-bin.000001	24391	Write_rows	1	24425	table_id: # flags: STMT_END_F
-master-bin.000001	24425	Table_map	1	24466	table_id: # (test.t1)
-master-bin.000001	24466	Write_rows	1	24500	table_id: # flags: STMT_END_F
-master-bin.000001	24500	Table_map	1	24541	table_id: # (test.t1)
-master-bin.000001	24541	Write_rows	1	24575	table_id: # flags: STMT_END_F
-master-bin.000001	24575	Table_map	1	24616	table_id: # (test.t1)
-master-bin.000001	24616	Write_rows	1	24650	table_id: # flags: STMT_END_F
-master-bin.000001	24650	Table_map	1	24691	table_id: # (test.t1)
-master-bin.000001	24691	Write_rows	1	24725	table_id: # flags: STMT_END_F
-master-bin.000001	24725	Table_map	1	24766	table_id: # (test.t1)
-master-bin.000001	24766	Write_rows	1	24800	table_id: # flags: STMT_END_F
-master-bin.000001	24800	Table_map	1	24841	table_id: # (test.t1)
-master-bin.000001	24841	Write_rows	1	24875	table_id: # flags: STMT_END_F
-master-bin.000001	24875	Table_map	1	24916	table_id: # (test.t1)
-master-bin.000001	24916	Write_rows	1	24950	table_id: # flags: STMT_END_F
-master-bin.000001	24950	Table_map	1	24991	table_id: # (test.t1)
-master-bin.000001	24991	Write_rows	1	25025	table_id: # flags: STMT_END_F
-master-bin.000001	25025	Table_map	1	25066	table_id: # (test.t1)
-master-bin.000001	25066	Write_rows	1	25100	table_id: # flags: STMT_END_F
-master-bin.000001	25100	Table_map	1	25141	table_id: # (test.t1)
-master-bin.000001	25141	Write_rows	1	25175	table_id: # flags: STMT_END_F
-master-bin.000001	25175	Table_map	1	25216	table_id: # (test.t1)
-master-bin.000001	25216	Write_rows	1	25250	table_id: # flags: STMT_END_F
-master-bin.000001	25250	Table_map	1	25291	table_id: # (test.t1)
-master-bin.000001	25291	Write_rows	1	25325	table_id: # flags: STMT_END_F
-master-bin.000001	25325	Table_map	1	25366	table_id: # (test.t1)
-master-bin.000001	25366	Write_rows	1	25400	table_id: # flags: STMT_END_F
-master-bin.000001	25400	Table_map	1	25441	table_id: # (test.t1)
-master-bin.000001	25441	Write_rows	1	25475	table_id: # flags: STMT_END_F
-master-bin.000001	25475	Table_map	1	25516	table_id: # (test.t1)
-master-bin.000001	25516	Write_rows	1	25550	table_id: # flags: STMT_END_F
-master-bin.000001	25550	Table_map	1	25591	table_id: # (test.t1)
-master-bin.000001	25591	Write_rows	1	25625	table_id: # flags: STMT_END_F
-master-bin.000001	25625	Table_map	1	25666	table_id: # (test.t1)
-master-bin.000001	25666	Write_rows	1	25700	table_id: # flags: STMT_END_F
-master-bin.000001	25700	Table_map	1	25741	table_id: # (test.t1)
-master-bin.000001	25741	Write_rows	1	25775	table_id: # flags: STMT_END_F
-master-bin.000001	25775	Table_map	1	25816	table_id: # (test.t1)
-master-bin.000001	25816	Write_rows	1	25850	table_id: # flags: STMT_END_F
-master-bin.000001	25850	Table_map	1	25891	table_id: # (test.t1)
-master-bin.000001	25891	Write_rows	1	25925	table_id: # flags: STMT_END_F
-master-bin.000001	25925	Table_map	1	25966	table_id: # (test.t1)
-master-bin.000001	25966	Write_rows	1	26000	table_id: # flags: STMT_END_F
-master-bin.000001	26000	Table_map	1	26041	table_id: # (test.t1)
-master-bin.000001	26041	Write_rows	1	26075	table_id: # flags: STMT_END_F
-master-bin.000001	26075	Table_map	1	26116	table_id: # (test.t1)
-master-bin.000001	26116	Write_rows	1	26150	table_id: # flags: STMT_END_F
-master-bin.000001	26150	Table_map	1	26191	table_id: # (test.t1)
-master-bin.000001	26191	Write_rows	1	26225	table_id: # flags: STMT_END_F
-master-bin.000001	26225	Table_map	1	26266	table_id: # (test.t1)
-master-bin.000001	26266	Write_rows	1	26300	table_id: # flags: STMT_END_F
-master-bin.000001	26300	Table_map	1	26341	table_id: # (test.t1)
-master-bin.000001	26341	Write_rows	1	26375	table_id: # flags: STMT_END_F
-master-bin.000001	26375	Table_map	1	26416	table_id: # (test.t1)
-master-bin.000001	26416	Write_rows	1	26450	table_id: # flags: STMT_END_F
-master-bin.000001	26450	Table_map	1	26491	table_id: # (test.t1)
-master-bin.000001	26491	Write_rows	1	26525	table_id: # flags: STMT_END_F
-master-bin.000001	26525	Table_map	1	26566	table_id: # (test.t1)
-master-bin.000001	26566	Write_rows	1	26600	table_id: # flags: STMT_END_F
-master-bin.000001	26600	Table_map	1	26641	table_id: # (test.t1)
-master-bin.000001	26641	Write_rows	1	26675	table_id: # flags: STMT_END_F
-master-bin.000001	26675	Table_map	1	26716	table_id: # (test.t1)
-master-bin.000001	26716	Write_rows	1	26750	table_id: # flags: STMT_END_F
-master-bin.000001	26750	Table_map	1	26791	table_id: # (test.t1)
-master-bin.000001	26791	Write_rows	1	26825	table_id: # flags: STMT_END_F
-master-bin.000001	26825	Table_map	1	26866	table_id: # (test.t1)
-master-bin.000001	26866	Write_rows	1	26900	table_id: # flags: STMT_END_F
-master-bin.000001	26900	Table_map	1	26941	table_id: # (test.t1)
-master-bin.000001	26941	Write_rows	1	26975	table_id: # flags: STMT_END_F
-master-bin.000001	26975	Table_map	1	27016	table_id: # (test.t1)
-master-bin.000001	27016	Write_rows	1	27050	table_id: # flags: STMT_END_F
-master-bin.000001	27050	Table_map	1	27091	table_id: # (test.t1)
-master-bin.000001	27091	Write_rows	1	27125	table_id: # flags: STMT_END_F
-master-bin.000001	27125	Table_map	1	27166	table_id: # (test.t1)
-master-bin.000001	27166	Write_rows	1	27200	table_id: # flags: STMT_END_F
-master-bin.000001	27200	Table_map	1	27241	table_id: # (test.t1)
-master-bin.000001	27241	Write_rows	1	27275	table_id: # flags: STMT_END_F
-master-bin.000001	27275	Table_map	1	27316	table_id: # (test.t1)
-master-bin.000001	27316	Write_rows	1	27350	table_id: # flags: STMT_END_F
-master-bin.000001	27350	Table_map	1	27391	table_id: # (test.t1)
-master-bin.000001	27391	Write_rows	1	27425	table_id: # flags: STMT_END_F
-master-bin.000001	27425	Table_map	1	27466	table_id: # (test.t1)
-master-bin.000001	27466	Write_rows	1	27500	table_id: # flags: STMT_END_F
-master-bin.000001	27500	Table_map	1	27541	table_id: # (test.t1)
-master-bin.000001	27541	Write_rows	1	27575	table_id: # flags: STMT_END_F
-master-bin.000001	27575	Table_map	1	27616	table_id: # (test.t1)
-master-bin.000001	27616	Write_rows	1	27650	table_id: # flags: STMT_END_F
-master-bin.000001	27650	Table_map	1	27691	table_id: # (test.t1)
-master-bin.000001	27691	Write_rows	1	27725	table_id: # flags: STMT_END_F
-master-bin.000001	27725	Table_map	1	27766	table_id: # (test.t1)
-master-bin.000001	27766	Write_rows	1	27800	table_id: # flags: STMT_END_F
-master-bin.000001	27800	Table_map	1	27841	table_id: # (test.t1)
-master-bin.000001	27841	Write_rows	1	27875	table_id: # flags: STMT_END_F
-master-bin.000001	27875	Table_map	1	27916	table_id: # (test.t1)
-master-bin.000001	27916	Write_rows	1	27950	table_id: # flags: STMT_END_F
-master-bin.000001	27950	Table_map	1	27991	table_id: # (test.t1)
-master-bin.000001	27991	Write_rows	1	28025	table_id: # flags: STMT_END_F
-master-bin.000001	28025	Table_map	1	28066	table_id: # (test.t1)
-master-bin.000001	28066	Write_rows	1	28100	table_id: # flags: STMT_END_F
-master-bin.000001	28100	Table_map	1	28141	table_id: # (test.t1)
-master-bin.000001	28141	Write_rows	1	28175	table_id: # flags: STMT_END_F
-master-bin.000001	28175	Table_map	1	28216	table_id: # (test.t1)
-master-bin.000001	28216	Write_rows	1	28250	table_id: # flags: STMT_END_F
-master-bin.000001	28250	Table_map	1	28291	table_id: # (test.t1)
-master-bin.000001	28291	Write_rows	1	28325	table_id: # flags: STMT_END_F
-master-bin.000001	28325	Table_map	1	28366	table_id: # (test.t1)
-master-bin.000001	28366	Write_rows	1	28400	table_id: # flags: STMT_END_F
-master-bin.000001	28400	Table_map	1	28441	table_id: # (test.t1)
-master-bin.000001	28441	Write_rows	1	28475	table_id: # flags: STMT_END_F
-master-bin.000001	28475	Table_map	1	28516	table_id: # (test.t1)
-master-bin.000001	28516	Write_rows	1	28550	table_id: # flags: STMT_END_F
-master-bin.000001	28550	Table_map	1	28591	table_id: # (test.t1)
-master-bin.000001	28591	Write_rows	1	28625	table_id: # flags: STMT_END_F
-master-bin.000001	28625	Table_map	1	28666	table_id: # (test.t1)
-master-bin.000001	28666	Write_rows	1	28700	table_id: # flags: STMT_END_F
-master-bin.000001	28700	Table_map	1	28741	table_id: # (test.t1)
-master-bin.000001	28741	Write_rows	1	28775	table_id: # flags: STMT_END_F
-master-bin.000001	28775	Table_map	1	28816	table_id: # (test.t1)
-master-bin.000001	28816	Write_rows	1	28850	table_id: # flags: STMT_END_F
-master-bin.000001	28850	Table_map	1	28891	table_id: # (test.t1)
-master-bin.000001	28891	Write_rows	1	28925	table_id: # flags: STMT_END_F
-master-bin.000001	28925	Table_map	1	28966	table_id: # (test.t1)
-master-bin.000001	28966	Write_rows	1	29000	table_id: # flags: STMT_END_F
-master-bin.000001	29000	Table_map	1	29041	table_id: # (test.t1)
-master-bin.000001	29041	Write_rows	1	29075	table_id: # flags: STMT_END_F
-master-bin.000001	29075	Table_map	1	29116	table_id: # (test.t1)
-master-bin.000001	29116	Write_rows	1	29150	table_id: # flags: STMT_END_F
-master-bin.000001	29150	Table_map	1	29191	table_id: # (test.t1)
-master-bin.000001	29191	Write_rows	1	29225	table_id: # flags: STMT_END_F
-master-bin.000001	29225	Table_map	1	29266	table_id: # (test.t1)
-master-bin.000001	29266	Write_rows	1	29300	table_id: # flags: STMT_END_F
-master-bin.000001	29300	Table_map	1	29341	table_id: # (test.t1)
-master-bin.000001	29341	Write_rows	1	29375	table_id: # flags: STMT_END_F
-master-bin.000001	29375	Table_map	1	29416	table_id: # (test.t1)
-master-bin.000001	29416	Write_rows	1	29450	table_id: # flags: STMT_END_F
-master-bin.000001	29450	Table_map	1	29491	table_id: # (test.t1)
-master-bin.000001	29491	Write_rows	1	29525	table_id: # flags: STMT_END_F
-master-bin.000001	29525	Table_map	1	29566	table_id: # (test.t1)
-master-bin.000001	29566	Write_rows	1	29600	table_id: # flags: STMT_END_F
-master-bin.000001	29600	Table_map	1	29641	table_id: # (test.t1)
-master-bin.000001	29641	Write_rows	1	29675	table_id: # flags: STMT_END_F
-master-bin.000001	29675	Table_map	1	29716	table_id: # (test.t1)
-master-bin.000001	29716	Write_rows	1	29750	table_id: # flags: STMT_END_F
-master-bin.000001	29750	Table_map	1	29791	table_id: # (test.t1)
-master-bin.000001	29791	Write_rows	1	29825	table_id: # flags: STMT_END_F
-master-bin.000001	29825	Table_map	1	29866	table_id: # (test.t1)
-master-bin.000001	29866	Write_rows	1	29900	table_id: # flags: STMT_END_F
-master-bin.000001	29900	Table_map	1	29941	table_id: # (test.t1)
-master-bin.000001	29941	Write_rows	1	29975	table_id: # flags: STMT_END_F
-master-bin.000001	29975	Table_map	1	30016	table_id: # (test.t1)
-master-bin.000001	30016	Write_rows	1	30050	table_id: # flags: STMT_END_F
-master-bin.000001	30050	Table_map	1	30091	table_id: # (test.t1)
-master-bin.000001	30091	Write_rows	1	30125	table_id: # flags: STMT_END_F
-master-bin.000001	30125	Table_map	1	30166	table_id: # (test.t1)
-master-bin.000001	30166	Write_rows	1	30200	table_id: # flags: STMT_END_F
-master-bin.000001	30200	Table_map	1	30241	table_id: # (test.t1)
-master-bin.000001	30241	Write_rows	1	30275	table_id: # flags: STMT_END_F
-master-bin.000001	30275	Xid	1	30302	COMMIT /* XID */
-master-bin.000001	30302	Rotate	1	30346	master-bin.000002;pos=4
-=======
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int) engine=innodb
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -2104,7 +1067,6 @@ master-bin.000001	#	Table_map	#	#	table_
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
->>>>>>> MERGE-SOURCE
 drop table t1;
 set global binlog_cache_size=@bcs;
 set session autocommit = @ac;
@@ -2119,22 +1081,12 @@ deallocate prepare stmt;
 drop table t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
-master-bin.000001	107	Query	1	228	use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
-master-bin.000001	228	Query	1	296	BEGIN
-master-bin.000001	296	Table_map	1	338	table_id: # (test.t1)
-master-bin.000001	338	Write_rows	1	384	table_id: # flags: STMT_END_F
-master-bin.000001	384	Query	1	453	COMMIT
-master-bin.000001	453	Query	1	529	use `test`; drop table t1
-=======
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; drop table t1
->>>>>>> MERGE-SOURCE
 reset master;
 CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
 USE bug39182;
@@ -2334,27 +1286,14 @@ drop table if exists t3;
 create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) ) engine=innodb;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-<<<<<<< TREE
-master-bin.000001	347		
-insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
-insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
-insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
-insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
-show master status /* must show new binlog index after rotating */;
-=======
 master-bin.000001	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 show master status;
->>>>>>> MERGE-SOURCE
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-<<<<<<< TREE
-master-bin.000002	107		
-=======
 master-bin.000002	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
->>>>>>> MERGE-SOURCE
 drop table t3;
 #
 # Bug #45998: database crashes when running "create as select"

=== modified file 'mysql-test/suite/binlog/r/binlog_stm_binlog.result'
--- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result	2010-06-18 11:10:53 +0000
@@ -4,18 +4,10 @@ insert into t1 values (1,2);
 commit;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server ver: #, Binlog ver: #
-master-bin.000001	107	Query	1	214	use `test`; create table t1 (a int, b int) engine=innodb
-master-bin.000001	214	Query	1	282	BEGIN
-master-bin.000001	282	Query	1	372	use `test`; insert into t1 values (1,2)
-master-bin.000001	372	Xid	1	399	COMMIT /* XID */
-=======
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int, b int) engine=innodb
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (1,2)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
->>>>>>> MERGE-SOURCE
 drop table t1;
 drop table if exists t1, t2;
 reset master;
@@ -43,117 +35,6 @@ create table t1 (n int) engine=innodb;
 begin;
 commit;
 drop table t1;
-<<<<<<< TREE
-show binlog events in 'master-bin.000001' from 107;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (n int) engine=innodb
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(100 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(99 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(98 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(97 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(96 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(95 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(94 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(93 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(92 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(91 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(90 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(89 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(88 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(87 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(86 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(85 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(84 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(83 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(82 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(81 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(80 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(79 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(78 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(77 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(76 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(75 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(74 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(73 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(72 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(71 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(70 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(69 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(68 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(67 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(66 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(65 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(64 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(63 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(62 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(61 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(60 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(59 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(58 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(57 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(56 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(55 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(54 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(53 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(52 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(51 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(50 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(49 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(48 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(47 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(46 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(45 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(44 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(43 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(42 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(41 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(40 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(39 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(38 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(37 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(36 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(35 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(34 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(33 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(32 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(31 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(30 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(29 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(28 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(27 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(26 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(25 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(24 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(23 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(22 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(21 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(20 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(19 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(18 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(17 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(16 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(15 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(14 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(13 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(12 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(11 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(10 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(9 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(8 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(7 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(6 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(5 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(4 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(3 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(2 + 4)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1 + 4)
-master-bin.000001	#	Xid	1	#	COMMIT /* xid= */
-master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
-show binlog events in 'master-bin.000002' from 107;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	#	Query	1	#	use `test`; drop table t1
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (n int) engine=innodb
@@ -263,7 +144,6 @@ master-bin.000001	#	Rotate	#	#	master-bi
 show binlog events in 'master-bin.000002' from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Query	#	#	use `test`; drop table t1
->>>>>>> MERGE-SOURCE
 set @ac = @@autocommit;
 set autocommit= 0;
 reset master;
@@ -276,16 +156,6 @@ commit;
 drop table t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
-master-bin.000001	107	Query	1	206	use `test`; create table t1(n int) engine=innodb
-master-bin.000001	206	Query	1	274	BEGIN
-master-bin.000001	274	Query	1	362	use `test`; insert into t1 values (1)
-master-bin.000001	362	Query	1	450	use `test`; insert into t1 values (2)
-master-bin.000001	450	Query	1	538	use `test`; insert into t1 values (3)
-master-bin.000001	538	Xid	1	565	COMMIT /* XID */
-master-bin.000001	565	Query	1	641	use `test`; drop table t1
-=======
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int) engine=innodb
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (1)
@@ -293,420 +163,12 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (3)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Query	#	#	use `test`; drop table t1
->>>>>>> MERGE-SOURCE
 set @bcs = @@binlog_cache_size;
 set global binlog_cache_size=4096;
 reset master;
 create table t1 (a int) engine=innodb;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
-master-bin.000001	107	Query	1	207	use `test`; create table t1 (a int) engine=innodb
-master-bin.000001	207	Query	1	275	BEGIN
-master-bin.000001	275	Query	1	366	use `test`; insert into t1 values( 400 )
-master-bin.000001	366	Query	1	457	use `test`; insert into t1 values( 399 )
-master-bin.000001	457	Query	1	548	use `test`; insert into t1 values( 398 )
-master-bin.000001	548	Query	1	639	use `test`; insert into t1 values( 397 )
-master-bin.000001	639	Query	1	730	use `test`; insert into t1 values( 396 )
-master-bin.000001	730	Query	1	821	use `test`; insert into t1 values( 395 )
-master-bin.000001	821	Query	1	912	use `test`; insert into t1 values( 394 )
-master-bin.000001	912	Query	1	1003	use `test`; insert into t1 values( 393 )
-master-bin.000001	1003	Query	1	1094	use `test`; insert into t1 values( 392 )
-master-bin.000001	1094	Query	1	1185	use `test`; insert into t1 values( 391 )
-master-bin.000001	1185	Query	1	1276	use `test`; insert into t1 values( 390 )
-master-bin.000001	1276	Query	1	1367	use `test`; insert into t1 values( 389 )
-master-bin.000001	1367	Query	1	1458	use `test`; insert into t1 values( 388 )
-master-bin.000001	1458	Query	1	1549	use `test`; insert into t1 values( 387 )
-master-bin.000001	1549	Query	1	1640	use `test`; insert into t1 values( 386 )
-master-bin.000001	1640	Query	1	1731	use `test`; insert into t1 values( 385 )
-master-bin.000001	1731	Query	1	1822	use `test`; insert into t1 values( 384 )
-master-bin.000001	1822	Query	1	1913	use `test`; insert into t1 values( 383 )
-master-bin.000001	1913	Query	1	2004	use `test`; insert into t1 values( 382 )
-master-bin.000001	2004	Query	1	2095	use `test`; insert into t1 values( 381 )
-master-bin.000001	2095	Query	1	2186	use `test`; insert into t1 values( 380 )
-master-bin.000001	2186	Query	1	2277	use `test`; insert into t1 values( 379 )
-master-bin.000001	2277	Query	1	2368	use `test`; insert into t1 values( 378 )
-master-bin.000001	2368	Query	1	2459	use `test`; insert into t1 values( 377 )
-master-bin.000001	2459	Query	1	2550	use `test`; insert into t1 values( 376 )
-master-bin.000001	2550	Query	1	2641	use `test`; insert into t1 values( 375 )
-master-bin.000001	2641	Query	1	2732	use `test`; insert into t1 values( 374 )
-master-bin.000001	2732	Query	1	2823	use `test`; insert into t1 values( 373 )
-master-bin.000001	2823	Query	1	2914	use `test`; insert into t1 values( 372 )
-master-bin.000001	2914	Query	1	3005	use `test`; insert into t1 values( 371 )
-master-bin.000001	3005	Query	1	3096	use `test`; insert into t1 values( 370 )
-master-bin.000001	3096	Query	1	3187	use `test`; insert into t1 values( 369 )
-master-bin.000001	3187	Query	1	3278	use `test`; insert into t1 values( 368 )
-master-bin.000001	3278	Query	1	3369	use `test`; insert into t1 values( 367 )
-master-bin.000001	3369	Query	1	3460	use `test`; insert into t1 values( 366 )
-master-bin.000001	3460	Query	1	3551	use `test`; insert into t1 values( 365 )
-master-bin.000001	3551	Query	1	3642	use `test`; insert into t1 values( 364 )
-master-bin.000001	3642	Query	1	3733	use `test`; insert into t1 values( 363 )
-master-bin.000001	3733	Query	1	3824	use `test`; insert into t1 values( 362 )
-master-bin.000001	3824	Query	1	3915	use `test`; insert into t1 values( 361 )
-master-bin.000001	3915	Query	1	4006	use `test`; insert into t1 values( 360 )
-master-bin.000001	4006	Query	1	4097	use `test`; insert into t1 values( 359 )
-master-bin.000001	4097	Query	1	4188	use `test`; insert into t1 values( 358 )
-master-bin.000001	4188	Query	1	4279	use `test`; insert into t1 values( 357 )
-master-bin.000001	4279	Query	1	4370	use `test`; insert into t1 values( 356 )
-master-bin.000001	4370	Query	1	4461	use `test`; insert into t1 values( 355 )
-master-bin.000001	4461	Query	1	4552	use `test`; insert into t1 values( 354 )
-master-bin.000001	4552	Query	1	4643	use `test`; insert into t1 values( 353 )
-master-bin.000001	4643	Query	1	4734	use `test`; insert into t1 values( 352 )
-master-bin.000001	4734	Query	1	4825	use `test`; insert into t1 values( 351 )
-master-bin.000001	4825	Query	1	4916	use `test`; insert into t1 values( 350 )
-master-bin.000001	4916	Query	1	5007	use `test`; insert into t1 values( 349 )
-master-bin.000001	5007	Query	1	5098	use `test`; insert into t1 values( 348 )
-master-bin.000001	5098	Query	1	5189	use `test`; insert into t1 values( 347 )
-master-bin.000001	5189	Query	1	5280	use `test`; insert into t1 values( 346 )
-master-bin.000001	5280	Query	1	5371	use `test`; insert into t1 values( 345 )
-master-bin.000001	5371	Query	1	5462	use `test`; insert into t1 values( 344 )
-master-bin.000001	5462	Query	1	5553	use `test`; insert into t1 values( 343 )
-master-bin.000001	5553	Query	1	5644	use `test`; insert into t1 values( 342 )
-master-bin.000001	5644	Query	1	5735	use `test`; insert into t1 values( 341 )
-master-bin.000001	5735	Query	1	5826	use `test`; insert into t1 values( 340 )
-master-bin.000001	5826	Query	1	5917	use `test`; insert into t1 values( 339 )
-master-bin.000001	5917	Query	1	6008	use `test`; insert into t1 values( 338 )
-master-bin.000001	6008	Query	1	6099	use `test`; insert into t1 values( 337 )
-master-bin.000001	6099	Query	1	6190	use `test`; insert into t1 values( 336 )
-master-bin.000001	6190	Query	1	6281	use `test`; insert into t1 values( 335 )
-master-bin.000001	6281	Query	1	6372	use `test`; insert into t1 values( 334 )
-master-bin.000001	6372	Query	1	6463	use `test`; insert into t1 values( 333 )
-master-bin.000001	6463	Query	1	6554	use `test`; insert into t1 values( 332 )
-master-bin.000001	6554	Query	1	6645	use `test`; insert into t1 values( 331 )
-master-bin.000001	6645	Query	1	6736	use `test`; insert into t1 values( 330 )
-master-bin.000001	6736	Query	1	6827	use `test`; insert into t1 values( 329 )
-master-bin.000001	6827	Query	1	6918	use `test`; insert into t1 values( 328 )
-master-bin.000001	6918	Query	1	7009	use `test`; insert into t1 values( 327 )
-master-bin.000001	7009	Query	1	7100	use `test`; insert into t1 values( 326 )
-master-bin.000001	7100	Query	1	7191	use `test`; insert into t1 values( 325 )
-master-bin.000001	7191	Query	1	7282	use `test`; insert into t1 values( 324 )
-master-bin.000001	7282	Query	1	7373	use `test`; insert into t1 values( 323 )
-master-bin.000001	7373	Query	1	7464	use `test`; insert into t1 values( 322 )
-master-bin.000001	7464	Query	1	7555	use `test`; insert into t1 values( 321 )
-master-bin.000001	7555	Query	1	7646	use `test`; insert into t1 values( 320 )
-master-bin.000001	7646	Query	1	7737	use `test`; insert into t1 values( 319 )
-master-bin.000001	7737	Query	1	7828	use `test`; insert into t1 values( 318 )
-master-bin.000001	7828	Query	1	7919	use `test`; insert into t1 values( 317 )
-master-bin.000001	7919	Query	1	8010	use `test`; insert into t1 values( 316 )
-master-bin.000001	8010	Query	1	8101	use `test`; insert into t1 values( 315 )
-master-bin.000001	8101	Query	1	8192	use `test`; insert into t1 values( 314 )
-master-bin.000001	8192	Query	1	8283	use `test`; insert into t1 values( 313 )
-master-bin.000001	8283	Query	1	8374	use `test`; insert into t1 values( 312 )
-master-bin.000001	8374	Query	1	8465	use `test`; insert into t1 values( 311 )
-master-bin.000001	8465	Query	1	8556	use `test`; insert into t1 values( 310 )
-master-bin.000001	8556	Query	1	8647	use `test`; insert into t1 values( 309 )
-master-bin.000001	8647	Query	1	8738	use `test`; insert into t1 values( 308 )
-master-bin.000001	8738	Query	1	8829	use `test`; insert into t1 values( 307 )
-master-bin.000001	8829	Query	1	8920	use `test`; insert into t1 values( 306 )
-master-bin.000001	8920	Query	1	9011	use `test`; insert into t1 values( 305 )
-master-bin.000001	9011	Query	1	9102	use `test`; insert into t1 values( 304 )
-master-bin.000001	9102	Query	1	9193	use `test`; insert into t1 values( 303 )
-master-bin.000001	9193	Query	1	9284	use `test`; insert into t1 values( 302 )
-master-bin.000001	9284	Query	1	9375	use `test`; insert into t1 values( 301 )
-master-bin.000001	9375	Query	1	9466	use `test`; insert into t1 values( 300 )
-master-bin.000001	9466	Query	1	9557	use `test`; insert into t1 values( 299 )
-master-bin.000001	9557	Query	1	9648	use `test`; insert into t1 values( 298 )
-master-bin.000001	9648	Query	1	9739	use `test`; insert into t1 values( 297 )
-master-bin.000001	9739	Query	1	9830	use `test`; insert into t1 values( 296 )
-master-bin.000001	9830	Query	1	9921	use `test`; insert into t1 values( 295 )
-master-bin.000001	9921	Query	1	10012	use `test`; insert into t1 values( 294 )
-master-bin.000001	10012	Query	1	10103	use `test`; insert into t1 values( 293 )
-master-bin.000001	10103	Query	1	10194	use `test`; insert into t1 values( 292 )
-master-bin.000001	10194	Query	1	10285	use `test`; insert into t1 values( 291 )
-master-bin.000001	10285	Query	1	10376	use `test`; insert into t1 values( 290 )
-master-bin.000001	10376	Query	1	10467	use `test`; insert into t1 values( 289 )
-master-bin.000001	10467	Query	1	10558	use `test`; insert into t1 values( 288 )
-master-bin.000001	10558	Query	1	10649	use `test`; insert into t1 values( 287 )
-master-bin.000001	10649	Query	1	10740	use `test`; insert into t1 values( 286 )
-master-bin.000001	10740	Query	1	10831	use `test`; insert into t1 values( 285 )
-master-bin.000001	10831	Query	1	10922	use `test`; insert into t1 values( 284 )
-master-bin.000001	10922	Query	1	11013	use `test`; insert into t1 values( 283 )
-master-bin.000001	11013	Query	1	11104	use `test`; insert into t1 values( 282 )
-master-bin.000001	11104	Query	1	11195	use `test`; insert into t1 values( 281 )
-master-bin.000001	11195	Query	1	11286	use `test`; insert into t1 values( 280 )
-master-bin.000001	11286	Query	1	11377	use `test`; insert into t1 values( 279 )
-master-bin.000001	11377	Query	1	11468	use `test`; insert into t1 values( 278 )
-master-bin.000001	11468	Query	1	11559	use `test`; insert into t1 values( 277 )
-master-bin.000001	11559	Query	1	11650	use `test`; insert into t1 values( 276 )
-master-bin.000001	11650	Query	1	11741	use `test`; insert into t1 values( 275 )
-master-bin.000001	11741	Query	1	11832	use `test`; insert into t1 values( 274 )
-master-bin.000001	11832	Query	1	11923	use `test`; insert into t1 values( 273 )
-master-bin.000001	11923	Query	1	12014	use `test`; insert into t1 values( 272 )
-master-bin.000001	12014	Query	1	12105	use `test`; insert into t1 values( 271 )
-master-bin.000001	12105	Query	1	12196	use `test`; insert into t1 values( 270 )
-master-bin.000001	12196	Query	1	12287	use `test`; insert into t1 values( 269 )
-master-bin.000001	12287	Query	1	12378	use `test`; insert into t1 values( 268 )
-master-bin.000001	12378	Query	1	12469	use `test`; insert into t1 values( 267 )
-master-bin.000001	12469	Query	1	12560	use `test`; insert into t1 values( 266 )
-master-bin.000001	12560	Query	1	12651	use `test`; insert into t1 values( 265 )
-master-bin.000001	12651	Query	1	12742	use `test`; insert into t1 values( 264 )
-master-bin.000001	12742	Query	1	12833	use `test`; insert into t1 values( 263 )
-master-bin.000001	12833	Query	1	12924	use `test`; insert into t1 values( 262 )
-master-bin.000001	12924	Query	1	13015	use `test`; insert into t1 values( 261 )
-master-bin.000001	13015	Query	1	13106	use `test`; insert into t1 values( 260 )
-master-bin.000001	13106	Query	1	13197	use `test`; insert into t1 values( 259 )
-master-bin.000001	13197	Query	1	13288	use `test`; insert into t1 values( 258 )
-master-bin.000001	13288	Query	1	13379	use `test`; insert into t1 values( 257 )
-master-bin.000001	13379	Query	1	13470	use `test`; insert into t1 values( 256 )
-master-bin.000001	13470	Query	1	13561	use `test`; insert into t1 values( 255 )
-master-bin.000001	13561	Query	1	13652	use `test`; insert into t1 values( 254 )
-master-bin.000001	13652	Query	1	13743	use `test`; insert into t1 values( 253 )
-master-bin.000001	13743	Query	1	13834	use `test`; insert into t1 values( 252 )
-master-bin.000001	13834	Query	1	13925	use `test`; insert into t1 values( 251 )
-master-bin.000001	13925	Query	1	14016	use `test`; insert into t1 values( 250 )
-master-bin.000001	14016	Query	1	14107	use `test`; insert into t1 values( 249 )
-master-bin.000001	14107	Query	1	14198	use `test`; insert into t1 values( 248 )
-master-bin.000001	14198	Query	1	14289	use `test`; insert into t1 values( 247 )
-master-bin.000001	14289	Query	1	14380	use `test`; insert into t1 values( 246 )
-master-bin.000001	14380	Query	1	14471	use `test`; insert into t1 values( 245 )
-master-bin.000001	14471	Query	1	14562	use `test`; insert into t1 values( 244 )
-master-bin.000001	14562	Query	1	14653	use `test`; insert into t1 values( 243 )
-master-bin.000001	14653	Query	1	14744	use `test`; insert into t1 values( 242 )
-master-bin.000001	14744	Query	1	14835	use `test`; insert into t1 values( 241 )
-master-bin.000001	14835	Query	1	14926	use `test`; insert into t1 values( 240 )
-master-bin.000001	14926	Query	1	15017	use `test`; insert into t1 values( 239 )
-master-bin.000001	15017	Query	1	15108	use `test`; insert into t1 values( 238 )
-master-bin.000001	15108	Query	1	15199	use `test`; insert into t1 values( 237 )
-master-bin.000001	15199	Query	1	15290	use `test`; insert into t1 values( 236 )
-master-bin.000001	15290	Query	1	15381	use `test`; insert into t1 values( 235 )
-master-bin.000001	15381	Query	1	15472	use `test`; insert into t1 values( 234 )
-master-bin.000001	15472	Query	1	15563	use `test`; insert into t1 values( 233 )
-master-bin.000001	15563	Query	1	15654	use `test`; insert into t1 values( 232 )
-master-bin.000001	15654	Query	1	15745	use `test`; insert into t1 values( 231 )
-master-bin.000001	15745	Query	1	15836	use `test`; insert into t1 values( 230 )
-master-bin.000001	15836	Query	1	15927	use `test`; insert into t1 values( 229 )
-master-bin.000001	15927	Query	1	16018	use `test`; insert into t1 values( 228 )
-master-bin.000001	16018	Query	1	16109	use `test`; insert into t1 values( 227 )
-master-bin.000001	16109	Query	1	16200	use `test`; insert into t1 values( 226 )
-master-bin.000001	16200	Query	1	16291	use `test`; insert into t1 values( 225 )
-master-bin.000001	16291	Query	1	16382	use `test`; insert into t1 values( 224 )
-master-bin.000001	16382	Query	1	16473	use `test`; insert into t1 values( 223 )
-master-bin.000001	16473	Query	1	16564	use `test`; insert into t1 values( 222 )
-master-bin.000001	16564	Query	1	16655	use `test`; insert into t1 values( 221 )
-master-bin.000001	16655	Query	1	16746	use `test`; insert into t1 values( 220 )
-master-bin.000001	16746	Query	1	16837	use `test`; insert into t1 values( 219 )
-master-bin.000001	16837	Query	1	16928	use `test`; insert into t1 values( 218 )
-master-bin.000001	16928	Query	1	17019	use `test`; insert into t1 values( 217 )
-master-bin.000001	17019	Query	1	17110	use `test`; insert into t1 values( 216 )
-master-bin.000001	17110	Query	1	17201	use `test`; insert into t1 values( 215 )
-master-bin.000001	17201	Query	1	17292	use `test`; insert into t1 values( 214 )
-master-bin.000001	17292	Query	1	17383	use `test`; insert into t1 values( 213 )
-master-bin.000001	17383	Query	1	17474	use `test`; insert into t1 values( 212 )
-master-bin.000001	17474	Query	1	17565	use `test`; insert into t1 values( 211 )
-master-bin.000001	17565	Query	1	17656	use `test`; insert into t1 values( 210 )
-master-bin.000001	17656	Query	1	17747	use `test`; insert into t1 values( 209 )
-master-bin.000001	17747	Query	1	17838	use `test`; insert into t1 values( 208 )
-master-bin.000001	17838	Query	1	17929	use `test`; insert into t1 values( 207 )
-master-bin.000001	17929	Query	1	18020	use `test`; insert into t1 values( 206 )
-master-bin.000001	18020	Query	1	18111	use `test`; insert into t1 values( 205 )
-master-bin.000001	18111	Query	1	18202	use `test`; insert into t1 values( 204 )
-master-bin.000001	18202	Query	1	18293	use `test`; insert into t1 values( 203 )
-master-bin.000001	18293	Query	1	18384	use `test`; insert into t1 values( 202 )
-master-bin.000001	18384	Query	1	18475	use `test`; insert into t1 values( 201 )
-master-bin.000001	18475	Query	1	18566	use `test`; insert into t1 values( 200 )
-master-bin.000001	18566	Query	1	18657	use `test`; insert into t1 values( 199 )
-master-bin.000001	18657	Query	1	18748	use `test`; insert into t1 values( 198 )
-master-bin.000001	18748	Query	1	18839	use `test`; insert into t1 values( 197 )
-master-bin.000001	18839	Query	1	18930	use `test`; insert into t1 values( 196 )
-master-bin.000001	18930	Query	1	19021	use `test`; insert into t1 values( 195 )
-master-bin.000001	19021	Query	1	19112	use `test`; insert into t1 values( 194 )
-master-bin.000001	19112	Query	1	19203	use `test`; insert into t1 values( 193 )
-master-bin.000001	19203	Query	1	19294	use `test`; insert into t1 values( 192 )
-master-bin.000001	19294	Query	1	19385	use `test`; insert into t1 values( 191 )
-master-bin.000001	19385	Query	1	19476	use `test`; insert into t1 values( 190 )
-master-bin.000001	19476	Query	1	19567	use `test`; insert into t1 values( 189 )
-master-bin.000001	19567	Query	1	19658	use `test`; insert into t1 values( 188 )
-master-bin.000001	19658	Query	1	19749	use `test`; insert into t1 values( 187 )
-master-bin.000001	19749	Query	1	19840	use `test`; insert into t1 values( 186 )
-master-bin.000001	19840	Query	1	19931	use `test`; insert into t1 values( 185 )
-master-bin.000001	19931	Query	1	20022	use `test`; insert into t1 values( 184 )
-master-bin.000001	20022	Query	1	20113	use `test`; insert into t1 values( 183 )
-master-bin.000001	20113	Query	1	20204	use `test`; insert into t1 values( 182 )
-master-bin.000001	20204	Query	1	20295	use `test`; insert into t1 values( 181 )
-master-bin.000001	20295	Query	1	20386	use `test`; insert into t1 values( 180 )
-master-bin.000001	20386	Query	1	20477	use `test`; insert into t1 values( 179 )
-master-bin.000001	20477	Query	1	20568	use `test`; insert into t1 values( 178 )
-master-bin.000001	20568	Query	1	20659	use `test`; insert into t1 values( 177 )
-master-bin.000001	20659	Query	1	20750	use `test`; insert into t1 values( 176 )
-master-bin.000001	20750	Query	1	20841	use `test`; insert into t1 values( 175 )
-master-bin.000001	20841	Query	1	20932	use `test`; insert into t1 values( 174 )
-master-bin.000001	20932	Query	1	21023	use `test`; insert into t1 values( 173 )
-master-bin.000001	21023	Query	1	21114	use `test`; insert into t1 values( 172 )
-master-bin.000001	21114	Query	1	21205	use `test`; insert into t1 values( 171 )
-master-bin.000001	21205	Query	1	21296	use `test`; insert into t1 values( 170 )
-master-bin.000001	21296	Query	1	21387	use `test`; insert into t1 values( 169 )
-master-bin.000001	21387	Query	1	21478	use `test`; insert into t1 values( 168 )
-master-bin.000001	21478	Query	1	21569	use `test`; insert into t1 values( 167 )
-master-bin.000001	21569	Query	1	21660	use `test`; insert into t1 values( 166 )
-master-bin.000001	21660	Query	1	21751	use `test`; insert into t1 values( 165 )
-master-bin.000001	21751	Query	1	21842	use `test`; insert into t1 values( 164 )
-master-bin.000001	21842	Query	1	21933	use `test`; insert into t1 values( 163 )
-master-bin.000001	21933	Query	1	22024	use `test`; insert into t1 values( 162 )
-master-bin.000001	22024	Query	1	22115	use `test`; insert into t1 values( 161 )
-master-bin.000001	22115	Query	1	22206	use `test`; insert into t1 values( 160 )
-master-bin.000001	22206	Query	1	22297	use `test`; insert into t1 values( 159 )
-master-bin.000001	22297	Query	1	22388	use `test`; insert into t1 values( 158 )
-master-bin.000001	22388	Query	1	22479	use `test`; insert into t1 values( 157 )
-master-bin.000001	22479	Query	1	22570	use `test`; insert into t1 values( 156 )
-master-bin.000001	22570	Query	1	22661	use `test`; insert into t1 values( 155 )
-master-bin.000001	22661	Query	1	22752	use `test`; insert into t1 values( 154 )
-master-bin.000001	22752	Query	1	22843	use `test`; insert into t1 values( 153 )
-master-bin.000001	22843	Query	1	22934	use `test`; insert into t1 values( 152 )
-master-bin.000001	22934	Query	1	23025	use `test`; insert into t1 values( 151 )
-master-bin.000001	23025	Query	1	23116	use `test`; insert into t1 values( 150 )
-master-bin.000001	23116	Query	1	23207	use `test`; insert into t1 values( 149 )
-master-bin.000001	23207	Query	1	23298	use `test`; insert into t1 values( 148 )
-master-bin.000001	23298	Query	1	23389	use `test`; insert into t1 values( 147 )
-master-bin.000001	23389	Query	1	23480	use `test`; insert into t1 values( 146 )
-master-bin.000001	23480	Query	1	23571	use `test`; insert into t1 values( 145 )
-master-bin.000001	23571	Query	1	23662	use `test`; insert into t1 values( 144 )
-master-bin.000001	23662	Query	1	23753	use `test`; insert into t1 values( 143 )
-master-bin.000001	23753	Query	1	23844	use `test`; insert into t1 values( 142 )
-master-bin.000001	23844	Query	1	23935	use `test`; insert into t1 values( 141 )
-master-bin.000001	23935	Query	1	24026	use `test`; insert into t1 values( 140 )
-master-bin.000001	24026	Query	1	24117	use `test`; insert into t1 values( 139 )
-master-bin.000001	24117	Query	1	24208	use `test`; insert into t1 values( 138 )
-master-bin.000001	24208	Query	1	24299	use `test`; insert into t1 values( 137 )
-master-bin.000001	24299	Query	1	24390	use `test`; insert into t1 values( 136 )
-master-bin.000001	24390	Query	1	24481	use `test`; insert into t1 values( 135 )
-master-bin.000001	24481	Query	1	24572	use `test`; insert into t1 values( 134 )
-master-bin.000001	24572	Query	1	24663	use `test`; insert into t1 values( 133 )
-master-bin.000001	24663	Query	1	24754	use `test`; insert into t1 values( 132 )
-master-bin.000001	24754	Query	1	24845	use `test`; insert into t1 values( 131 )
-master-bin.000001	24845	Query	1	24936	use `test`; insert into t1 values( 130 )
-master-bin.000001	24936	Query	1	25027	use `test`; insert into t1 values( 129 )
-master-bin.000001	25027	Query	1	25118	use `test`; insert into t1 values( 128 )
-master-bin.000001	25118	Query	1	25209	use `test`; insert into t1 values( 127 )
-master-bin.000001	25209	Query	1	25300	use `test`; insert into t1 values( 126 )
-master-bin.000001	25300	Query	1	25391	use `test`; insert into t1 values( 125 )
-master-bin.000001	25391	Query	1	25482	use `test`; insert into t1 values( 124 )
-master-bin.000001	25482	Query	1	25573	use `test`; insert into t1 values( 123 )
-master-bin.000001	25573	Query	1	25664	use `test`; insert into t1 values( 122 )
-master-bin.000001	25664	Query	1	25755	use `test`; insert into t1 values( 121 )
-master-bin.000001	25755	Query	1	25846	use `test`; insert into t1 values( 120 )
-master-bin.000001	25846	Query	1	25937	use `test`; insert into t1 values( 119 )
-master-bin.000001	25937	Query	1	26028	use `test`; insert into t1 values( 118 )
-master-bin.000001	26028	Query	1	26119	use `test`; insert into t1 values( 117 )
-master-bin.000001	26119	Query	1	26210	use `test`; insert into t1 values( 116 )
-master-bin.000001	26210	Query	1	26301	use `test`; insert into t1 values( 115 )
-master-bin.000001	26301	Query	1	26392	use `test`; insert into t1 values( 114 )
-master-bin.000001	26392	Query	1	26483	use `test`; insert into t1 values( 113 )
-master-bin.000001	26483	Query	1	26574	use `test`; insert into t1 values( 112 )
-master-bin.000001	26574	Query	1	26665	use `test`; insert into t1 values( 111 )
-master-bin.000001	26665	Query	1	26756	use `test`; insert into t1 values( 110 )
-master-bin.000001	26756	Query	1	26847	use `test`; insert into t1 values( 109 )
-master-bin.000001	26847	Query	1	26938	use `test`; insert into t1 values( 108 )
-master-bin.000001	26938	Query	1	27029	use `test`; insert into t1 values( 107 )
-master-bin.000001	27029	Query	1	27120	use `test`; insert into t1 values( 106 )
-master-bin.000001	27120	Query	1	27211	use `test`; insert into t1 values( 105 )
-master-bin.000001	27211	Query	1	27302	use `test`; insert into t1 values( 104 )
-master-bin.000001	27302	Query	1	27393	use `test`; insert into t1 values( 103 )
-master-bin.000001	27393	Query	1	27484	use `test`; insert into t1 values( 102 )
-master-bin.000001	27484	Query	1	27575	use `test`; insert into t1 values( 101 )
-master-bin.000001	27575	Query	1	27666	use `test`; insert into t1 values( 100 )
-master-bin.000001	27666	Query	1	27756	use `test`; insert into t1 values( 99 )
-master-bin.000001	27756	Query	1	27846	use `test`; insert into t1 values( 98 )
-master-bin.000001	27846	Query	1	27936	use `test`; insert into t1 values( 97 )
-master-bin.000001	27936	Query	1	28026	use `test`; insert into t1 values( 96 )
-master-bin.000001	28026	Query	1	28116	use `test`; insert into t1 values( 95 )
-master-bin.000001	28116	Query	1	28206	use `test`; insert into t1 values( 94 )
-master-bin.000001	28206	Query	1	28296	use `test`; insert into t1 values( 93 )
-master-bin.000001	28296	Query	1	28386	use `test`; insert into t1 values( 92 )
-master-bin.000001	28386	Query	1	28476	use `test`; insert into t1 values( 91 )
-master-bin.000001	28476	Query	1	28566	use `test`; insert into t1 values( 90 )
-master-bin.000001	28566	Query	1	28656	use `test`; insert into t1 values( 89 )
-master-bin.000001	28656	Query	1	28746	use `test`; insert into t1 values( 88 )
-master-bin.000001	28746	Query	1	28836	use `test`; insert into t1 values( 87 )
-master-bin.000001	28836	Query	1	28926	use `test`; insert into t1 values( 86 )
-master-bin.000001	28926	Query	1	29016	use `test`; insert into t1 values( 85 )
-master-bin.000001	29016	Query	1	29106	use `test`; insert into t1 values( 84 )
-master-bin.000001	29106	Query	1	29196	use `test`; insert into t1 values( 83 )
-master-bin.000001	29196	Query	1	29286	use `test`; insert into t1 values( 82 )
-master-bin.000001	29286	Query	1	29376	use `test`; insert into t1 values( 81 )
-master-bin.000001	29376	Query	1	29466	use `test`; insert into t1 values( 80 )
-master-bin.000001	29466	Query	1	29556	use `test`; insert into t1 values( 79 )
-master-bin.000001	29556	Query	1	29646	use `test`; insert into t1 values( 78 )
-master-bin.000001	29646	Query	1	29736	use `test`; insert into t1 values( 77 )
-master-bin.000001	29736	Query	1	29826	use `test`; insert into t1 values( 76 )
-master-bin.000001	29826	Query	1	29916	use `test`; insert into t1 values( 75 )
-master-bin.000001	29916	Query	1	30006	use `test`; insert into t1 values( 74 )
-master-bin.000001	30006	Query	1	30096	use `test`; insert into t1 values( 73 )
-master-bin.000001	30096	Query	1	30186	use `test`; insert into t1 values( 72 )
-master-bin.000001	30186	Query	1	30276	use `test`; insert into t1 values( 71 )
-master-bin.000001	30276	Query	1	30366	use `test`; insert into t1 values( 70 )
-master-bin.000001	30366	Query	1	30456	use `test`; insert into t1 values( 69 )
-master-bin.000001	30456	Query	1	30546	use `test`; insert into t1 values( 68 )
-master-bin.000001	30546	Query	1	30636	use `test`; insert into t1 values( 67 )
-master-bin.000001	30636	Query	1	30726	use `test`; insert into t1 values( 66 )
-master-bin.000001	30726	Query	1	30816	use `test`; insert into t1 values( 65 )
-master-bin.000001	30816	Query	1	30906	use `test`; insert into t1 values( 64 )
-master-bin.000001	30906	Query	1	30996	use `test`; insert into t1 values( 63 )
-master-bin.000001	30996	Query	1	31086	use `test`; insert into t1 values( 62 )
-master-bin.000001	31086	Query	1	31176	use `test`; insert into t1 values( 61 )
-master-bin.000001	31176	Query	1	31266	use `test`; insert into t1 values( 60 )
-master-bin.000001	31266	Query	1	31356	use `test`; insert into t1 values( 59 )
-master-bin.000001	31356	Query	1	31446	use `test`; insert into t1 values( 58 )
-master-bin.000001	31446	Query	1	31536	use `test`; insert into t1 values( 57 )
-master-bin.000001	31536	Query	1	31626	use `test`; insert into t1 values( 56 )
-master-bin.000001	31626	Query	1	31716	use `test`; insert into t1 values( 55 )
-master-bin.000001	31716	Query	1	31806	use `test`; insert into t1 values( 54 )
-master-bin.000001	31806	Query	1	31896	use `test`; insert into t1 values( 53 )
-master-bin.000001	31896	Query	1	31986	use `test`; insert into t1 values( 52 )
-master-bin.000001	31986	Query	1	32076	use `test`; insert into t1 values( 51 )
-master-bin.000001	32076	Query	1	32166	use `test`; insert into t1 values( 50 )
-master-bin.000001	32166	Query	1	32256	use `test`; insert into t1 values( 49 )
-master-bin.000001	32256	Query	1	32346	use `test`; insert into t1 values( 48 )
-master-bin.000001	32346	Query	1	32436	use `test`; insert into t1 values( 47 )
-master-bin.000001	32436	Query	1	32526	use `test`; insert into t1 values( 46 )
-master-bin.000001	32526	Query	1	32616	use `test`; insert into t1 values( 45 )
-master-bin.000001	32616	Query	1	32706	use `test`; insert into t1 values( 44 )
-master-bin.000001	32706	Query	1	32796	use `test`; insert into t1 values( 43 )
-master-bin.000001	32796	Query	1	32886	use `test`; insert into t1 values( 42 )
-master-bin.000001	32886	Query	1	32976	use `test`; insert into t1 values( 41 )
-master-bin.000001	32976	Query	1	33066	use `test`; insert into t1 values( 40 )
-master-bin.000001	33066	Query	1	33156	use `test`; insert into t1 values( 39 )
-master-bin.000001	33156	Query	1	33246	use `test`; insert into t1 values( 38 )
-master-bin.000001	33246	Query	1	33336	use `test`; insert into t1 values( 37 )
-master-bin.000001	33336	Query	1	33426	use `test`; insert into t1 values( 36 )
-master-bin.000001	33426	Query	1	33516	use `test`; insert into t1 values( 35 )
-master-bin.000001	33516	Query	1	33606	use `test`; insert into t1 values( 34 )
-master-bin.000001	33606	Query	1	33696	use `test`; insert into t1 values( 33 )
-master-bin.000001	33696	Query	1	33786	use `test`; insert into t1 values( 32 )
-master-bin.000001	33786	Query	1	33876	use `test`; insert into t1 values( 31 )
-master-bin.000001	33876	Query	1	33966	use `test`; insert into t1 values( 30 )
-master-bin.000001	33966	Query	1	34056	use `test`; insert into t1 values( 29 )
-master-bin.000001	34056	Query	1	34146	use `test`; insert into t1 values( 28 )
-master-bin.000001	34146	Query	1	34236	use `test`; insert into t1 values( 27 )
-master-bin.000001	34236	Query	1	34326	use `test`; insert into t1 values( 26 )
-master-bin.000001	34326	Query	1	34416	use `test`; insert into t1 values( 25 )
-master-bin.000001	34416	Query	1	34506	use `test`; insert into t1 values( 24 )
-master-bin.000001	34506	Query	1	34596	use `test`; insert into t1 values( 23 )
-master-bin.000001	34596	Query	1	34686	use `test`; insert into t1 values( 22 )
-master-bin.000001	34686	Query	1	34776	use `test`; insert into t1 values( 21 )
-master-bin.000001	34776	Query	1	34866	use `test`; insert into t1 values( 20 )
-master-bin.000001	34866	Query	1	34956	use `test`; insert into t1 values( 19 )
-master-bin.000001	34956	Query	1	35046	use `test`; insert into t1 values( 18 )
-master-bin.000001	35046	Query	1	35136	use `test`; insert into t1 values( 17 )
-master-bin.000001	35136	Query	1	35226	use `test`; insert into t1 values( 16 )
-master-bin.000001	35226	Query	1	35316	use `test`; insert into t1 values( 15 )
-master-bin.000001	35316	Query	1	35406	use `test`; insert into t1 values( 14 )
-master-bin.000001	35406	Query	1	35496	use `test`; insert into t1 values( 13 )
-master-bin.000001	35496	Query	1	35586	use `test`; insert into t1 values( 12 )
-master-bin.000001	35586	Query	1	35676	use `test`; insert into t1 values( 11 )
-master-bin.000001	35676	Query	1	35766	use `test`; insert into t1 values( 10 )
-master-bin.000001	35766	Query	1	35855	use `test`; insert into t1 values( 9 )
-master-bin.000001	35855	Query	1	35944	use `test`; insert into t1 values( 8 )
-master-bin.000001	35944	Query	1	36033	use `test`; insert into t1 values( 7 )
-master-bin.000001	36033	Query	1	36122	use `test`; insert into t1 values( 6 )
-master-bin.000001	36122	Query	1	36211	use `test`; insert into t1 values( 5 )
-master-bin.000001	36211	Query	1	36300	use `test`; insert into t1 values( 4 )
-master-bin.000001	36300	Query	1	36389	use `test`; insert into t1 values( 3 )
-master-bin.000001	36389	Query	1	36478	use `test`; insert into t1 values( 2 )
-master-bin.000001	36478	Query	1	36567	use `test`; insert into t1 values( 1 )
-master-bin.000001	36567	Xid	1	36594	COMMIT /* XID */
-master-bin.000001	36594	Rotate	1	36638	master-bin.000002;pos=4
-=======
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int) engine=innodb
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 400 )
@@ -1002,8 +464,8 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 110 )
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 109 )
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 108 )
-master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 107 )
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( <binlog_start> )
+master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 106 )
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 105 )
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 104 )
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 103 )
@@ -1111,7 +573,6 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values( 1 )
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
->>>>>>> MERGE-SOURCE
 drop table t1;
 set global binlog_cache_size=@bcs;
 set session autocommit = @ac;
@@ -1126,18 +587,11 @@ deallocate prepare stmt;
 drop table t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
-master-bin.000001	107	Query	1	228	use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
-master-bin.000001	228	Query	1	296	BEGIN
-master-bin.000001	296	Query	1	420	use `test`; insert into t1 values (9999999999999999,14632475938453979136)
-master-bin.000001	420	Query	1	489	COMMIT
-master-bin.000001	489	Query	1	565	use `test`; drop table t1
-=======
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (9999999999999999,14632475938453979136)
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; drop table t1
->>>>>>> MERGE-SOURCE
 reset master;
 CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
 USE bug39182;
@@ -1324,27 +778,14 @@ drop table if exists t3;
 create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) ) engine=innodb;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-<<<<<<< TREE
-master-bin.000001	347		
-insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
-insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
-insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
-insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
-show master status /* must show new binlog index after rotating */;
-=======
 master-bin.000001	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 show master status;
->>>>>>> MERGE-SOURCE
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-<<<<<<< TREE
-master-bin.000002	107		
-=======
 master-bin.000002	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
->>>>>>> MERGE-SOURCE
 drop table t3;
 #
 # Bug #45998: database crashes when running "create as select"

=== modified file 'mysql-test/suite/binlog/r/binlog_unsafe.result'
--- a/mysql-test/suite/binlog/r/binlog_unsafe.result	2010-02-12 23:30:44 +0000
+++ b/mysql-test/suite/binlog/r/binlog_unsafe.result	2010-06-18 11:10:53 +0000
@@ -3150,14 +3150,14 @@ Note	1592	Unsafe statement binlogged in 
 SET SESSION binlog_format = MIXED;
 # Check if the statement is logged in row format.
 INSERT INTO t2 SET a = func_modify_t1();
-SHOW BINLOG EVENTS FROM 1493;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	1493	Query	1	1561	BEGIN
-master-bin.000001	1561	Table_map	1	1603	table_id: 205 (test.t2)
-master-bin.000001	1603	Table_map	1	1645	table_id: 206 (test.t1)
-master-bin.000001	1645	Write_rows	1	1683	table_id: 206
-master-bin.000001	1683	Write_rows	1	1721	table_id: 205 flags: STMT_END_F
-master-bin.000001	1721	Query	1	1790	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	COMMIT
 DROP TABLE t1,t2;
 DROP FUNCTION func_modify_t1;
 SET SESSION binlog_format = STATEMENT;
@@ -3177,16 +3177,16 @@ Note	1592	Unsafe statement binlogged in 
 SET SESSION binlog_format = MIXED;
 # Check if the statement is logged in row format.
 INSERT INTO t1 SET a = 2;
-SHOW BINLOG EVENTS FROM 2773;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	2773	Query	1	2841	BEGIN
-master-bin.000001	2841	Table_map	1	2882	table_id: 208 (test.t1)
-master-bin.000001	2882	Table_map	1	2924	table_id: 209 (test.t3)
-master-bin.000001	2924	Table_map	1	2966	table_id: 210 (test.t2)
-master-bin.000001	2966	Write_rows	1	3004	table_id: 210
-master-bin.000001	3004	Write_rows	1	3042	table_id: 209
-master-bin.000001	3042	Write_rows	1	3076	table_id: 208 flags: STMT_END_F
-master-bin.000001	3076	Query	1	3145	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t3)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: #
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	COMMIT
 DROP TABLE t1,t2,t3;
 SET SESSION binlog_format = STATEMENT;
 CREATE TABLE t1 (a VARCHAR(1000));

=== modified file 'mysql-test/suite/binlog/t/binlog_unsafe.test'
--- a/mysql-test/suite/binlog/t/binlog_unsafe.test	2010-02-12 23:30:44 +0000
+++ b/mysql-test/suite/binlog/t/binlog_unsafe.test	2010-06-18 11:10:53 +0000
@@ -607,9 +607,9 @@ INSERT INTO t2 SET a = func_modify_t1();
 
 SET SESSION binlog_format = MIXED;
 --echo # Check if the statement is logged in row format.
-let $pos0_master= query_get_value(SHOW MASTER STATUS, Position, 1);
+let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
 INSERT INTO t2 SET a = func_modify_t1();
-eval SHOW BINLOG EVENTS FROM $pos0_master;
+--source include/show_binlog_events.inc
 
 # clean up
 DROP TABLE t1,t2;
@@ -637,9 +637,9 @@ INSERT INTO t1 SET a = 1;
 
 SET SESSION binlog_format = MIXED;
 --echo # Check if the statement is logged in row format.
-let $pos1_master= query_get_value(SHOW MASTER STATUS, Position, 1);
+let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
 INSERT INTO t1 SET a = 2;
-eval SHOW BINLOG EVENTS FROM $pos1_master;
+--source include/show_binlog_events.inc
 
 # clean up
 DROP TABLE t1,t2,t3;

=== modified file 'mysql-test/suite/engines/funcs/r/rpl_000015.result'
--- a/mysql-test/suite/engines/funcs/r/rpl_000015.result	2010-05-24 13:54:08 +0000
+++ b/mysql-test/suite/engines/funcs/r/rpl_000015.result	2010-06-18 11:10:53 +0000
@@ -7,7 +7,7 @@ start slave;
 reset master;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	106		
+master-bin.000001	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
 stop slave;
 reset slave;
 Master_Log_File	

=== modified file 'mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result'
--- a/mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result	2010-05-24 13:54:08 +0000
+++ b/mysql-test/suite/engines/funcs/r/rpl_stm_reset_slave.result	2010-06-18 11:10:53 +0000
@@ -11,8 +11,9 @@ change master to master_user='test';
 Master_User	test
 Master_Host	127.0.0.1
 reset slave;
-Master_User	root
+Master_User	test
 Master_Host	127.0.0.1
+change master to master_user='root';
 include/start_slave.inc
 Master_User	root
 Master_Host	127.0.0.1

=== modified file 'mysql-test/suite/engines/funcs/t/rpl_000015.test'
--- a/mysql-test/suite/engines/funcs/t/rpl_000015.test	2010-05-24 13:54:08 +0000
+++ b/mysql-test/suite/engines/funcs/t/rpl_000015.test	2010-06-18 11:10:53 +0000
@@ -6,7 +6,7 @@
 source include/master-slave.inc;
 
 reset master;
-show master status;
+source include/show_master_status.inc;
 save_master_pos;
 connection slave;
 stop slave;

=== modified file 'mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result'
--- a/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result	2010-05-24 13:54:08 +0000
+++ b/mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result	2010-06-18 11:10:53 +0000
@@ -461,11 +461,11 @@ INSERT INTO t10 () VALUES(1,@b1,DEFAULT,
 (3,@b1,DEFAULT,'QA',DEFAULT);
 
 ********************************************
-*** Expect slave to fail with Error 1535 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
 
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
 
@@ -499,11 +499,11 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing
 (3,@b1,DEFAULT,'QA',DEFAULT);
 
 ********************************************
-*** Expect slave to fail with Error 1535 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
 
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
 
@@ -1334,11 +1334,11 @@ INSERT INTO t10 () VALUES(1,@b1,DEFAULT,
 (3,@b1,DEFAULT,'QA',DEFAULT);
 
 ********************************************
-*** Expect slave to fail with Error 1535 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
 
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
 
@@ -1372,11 +1372,11 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing
 (3,@b1,DEFAULT,'QA',DEFAULT);
 
 ********************************************
-*** Expect slave to fail with Error 1535 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
 
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
 

=== modified file 'mysql-test/suite/parts/r/rpl_partition.result'
--- a/mysql-test/suite/parts/r/rpl_partition.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/parts/r/rpl_partition.result	2010-06-18 11:10:53 +0000
@@ -149,51 +149,7 @@ SUBPARTITIONS 2
  PARTITION pa9 VALUES LESS THAN (90) ENGINE = InnoDB,
  PARTITION pa10 VALUES LESS THAN (100) ENGINE = InnoDB,
  PARTITION pa11 VALUES LESS THAN MAXVALUE ENGINE = InnoDB) */
-<<<<<<< TREE
-show slave status;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_MYPORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 SELECT count(*) "Slave norm" FROM t1;
 Slave norm	500
 SELECT count(*) "Slave bykey" FROM t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_binlog_grant.result'
--- a/mysql-test/suite/rpl/r/rpl_binlog_grant.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_binlog_grant.result	2010-06-18 11:10:53 +0000
@@ -17,18 +17,6 @@ show grants for x@y;
 Grants for x@y
 GRANT USAGE ON *.* TO 'x'@'y'
 GRANT SELECT ON `d1`.`t` TO 'x'@'y'
-<<<<<<< TREE
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	drop database if exists d1
-master-bin.000001	#	Query	#	#	create database d1
-master-bin.000001	#	Query	#	#	use `d1`; create table t (s1 int) engine=innodb
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `d1`; insert into t values (1)
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `d1`; grant select on t to x@y
-=======
->>>>>>> MERGE-SOURCE
 start transaction;
 insert into t values (2);
 revoke select on t from x@y;
@@ -40,21 +28,5 @@ s1
 show grants for x@y;
 Grants for x@y
 GRANT USAGE ON *.* TO 'x'@'y'
-<<<<<<< TREE
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	drop database if exists d1
-master-bin.000001	#	Query	#	#	create database d1
-master-bin.000001	#	Query	#	#	use `d1`; create table t (s1 int) engine=innodb
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `d1`; insert into t values (1)
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `d1`; grant select on t to x@y
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `d1`; insert into t values (2)
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `d1`; revoke select on t from x@y
-=======
->>>>>>> MERGE-SOURCE
 drop user x@y;
 drop database d1;

=== modified file 'mysql-test/suite/rpl/r/rpl_bug33931.result'
--- a/mysql-test/suite/rpl/r/rpl_bug33931.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug33931.result	2010-06-18 11:10:53 +0000
@@ -3,49 +3,5 @@ reset slave;
 call mtr.add_suppression("Failed during slave I/O thread initialization");
 SET GLOBAL debug="d,simulate_io_slave_error_on_init,simulate_sql_slave_error_on_init";
 start slave;
-<<<<<<< TREE
-show slave status;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	
-Read_Master_Log_Pos	4
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	#
-Last_Error	Failed during slave thread initialization
-Skip_Counter	0
-Exec_Master_Log_Pos	0
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	#
-Last_SQL_Error	Failed during slave thread initialization
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	0
-=======
 Last_SQL_Error = Failed during slave thread initialization
->>>>>>> MERGE-SOURCE
 SET GLOBAL debug="";

=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2010-06-18 11:10:53 +0000
@@ -10,97 +10,8 @@ n
 stop slave sql_thread;
 insert into t1 values(1);
 insert into t1 values(2);
-<<<<<<< TREE
-stop slave;
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 include/stop_slave.inc
->>>>>>> MERGE-SOURCE
 change master to master_user='root';
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 start slave;
 select * from t1;
 n

=== modified file 'mysql-test/suite/rpl/r/rpl_deadlock_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result	2010-06-18 11:10:53 +0000
@@ -50,51 +50,7 @@ a
 SELECT * FROM t3;
 a
 3
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 
 *** Test lock wait timeout ***
 include/stop_slave.inc
@@ -118,62 +74,14 @@ SELECT * FROM t3;
 a
 3
 3
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 
 *** Test lock wait timeout and purged relay logs ***
 SET @my_max_relay_log_size= @@global.max_relay_log_size;
 SET global max_relay_log_size=0;
 include/stop_slave.inc
 DELETE FROM t2;
-<<<<<<< TREE
-CHANGE MASTER TO MASTER_LOG_POS=441;
-=======
 CHANGE MASTER TO MASTER_LOG_POS=MASTER_POS_BEGIN;
->>>>>>> MERGE-SOURCE
 BEGIN;
 SELECT * FROM t1 FOR UPDATE;
 a
@@ -195,51 +103,7 @@ a
 3
 3
 3
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 
 *** Clean up ***
 DROP TABLE t1,t2,t3;

=== modified file 'mysql-test/suite/rpl/r/rpl_extraCol_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result	2010-06-18 11:10:53 +0000
@@ -57,11 +57,7 @@ a	b	c
 3	4	QA TESTING
 *** Start Slave ***
 START SLAVE;
-<<<<<<< TREE
-Slave failed with Error 1658
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)'
 STOP SLAVE;
 RESET SLAVE;
 SELECT * FROM t2 ORDER BY a;
@@ -88,18 +84,12 @@ set @b1 = 'b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
+Last_SQL_Error = Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t3  ***
 DROP TABLE t3;
 *** Create t4 on slave  ***
@@ -119,18 +109,12 @@ START SLAVE;
 INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
 (30000.22,4,'QA TESTING');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
+Last_SQL_Error = Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t4  ***
 DROP TABLE t4;
 *** Create t5 on slave  ***
@@ -150,18 +134,12 @@ START SLAVE;
 INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
 (2,'JOE',300.01,0,'b2b2',1.0000009);
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t5  ***
 DROP TABLE t5;
 *** Create t6 on slave  ***
@@ -180,13 +158,9 @@ START SLAVE;
 INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
 (2,'JOE',300.01,0);
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
 *** Drop t6  ***
 DROP TABLE t6;
@@ -282,18 +256,12 @@ set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t10  ***
 DROP TABLE t10;
 *** Create t11 on slave  ***
@@ -312,18 +280,12 @@ set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t11  ***
 DROP TABLE t11;
 *** Create t12 on slave  ***
@@ -533,16 +495,10 @@ ALTER TABLE t15 ADD COLUMN c6 INT AFTER 
 ********************************************
 *** Expect slave to fail with Error 1060 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1060
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 1;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Try to insert in master ****
 INSERT INTO t15 () VALUES(5,2.00,'Replication Testing',@b1,'Buda',2);
 SELECT * FROM t15 ORDER BY c1;
@@ -640,17 +596,11 @@ START SLAVE;
 *** Master Data Insert ***
 INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
+Last_SQL_Error = Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 ** DROP table t17 ***
 DROP TABLE t17;

=== modified file 'mysql-test/suite/rpl/r/rpl_extraCol_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result	2010-06-18 11:10:53 +0000
@@ -57,11 +57,7 @@ a	b	c
 3	4	QA TESTING
 *** Start Slave ***
 START SLAVE;
-<<<<<<< TREE
-Slave failed with Error 1658
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)'
 STOP SLAVE;
 RESET SLAVE;
 SELECT * FROM t2 ORDER BY a;
@@ -88,18 +84,12 @@ set @b1 = 'b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
+Last_SQL_Error = Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t3  ***
 DROP TABLE t3;
 *** Create t4 on slave  ***
@@ -119,18 +109,12 @@ START SLAVE;
 INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
 (30000.22,4,'QA TESTING');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
+Last_SQL_Error = Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t4  ***
 DROP TABLE t4;
 *** Create t5 on slave  ***
@@ -150,18 +134,12 @@ START SLAVE;
 INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
 (2,'JOE',300.01,0,'b2b2',1.0000009);
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t5  ***
 DROP TABLE t5;
 *** Create t6 on slave  ***
@@ -180,13 +158,9 @@ START SLAVE;
 INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
 (2,'JOE',300.01,0);
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
 *** Drop t6  ***
 DROP TABLE t6;
@@ -282,18 +256,12 @@ set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t10  ***
 DROP TABLE t10;
 *** Create t11 on slave  ***
@@ -312,18 +280,12 @@ set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t11  ***
 DROP TABLE t11;
 *** Create t12 on slave  ***
@@ -533,16 +495,10 @@ ALTER TABLE t15 ADD COLUMN c6 INT AFTER 
 ********************************************
 *** Expect slave to fail with Error 1060 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1060
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 1;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Try to insert in master ****
 INSERT INTO t15 () VALUES(5,2.00,'Replication Testing',@b1,'Buda',2);
 SELECT * FROM t15 ORDER BY c1;
@@ -640,17 +596,11 @@ START SLAVE;
 *** Master Data Insert ***
 INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
+Last_SQL_Error = Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 ** DROP table t17 ***
 DROP TABLE t17;

=== modified file 'mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result	2010-06-18 11:10:53 +0000
@@ -90,2658 +90,6 @@ f1	f2	f3	f4
 27	27	27	next
 29	29	29	second
 30	30	30	next
-<<<<<<< TREE
-
-* Show Slave Status *
-
-show slave status;;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-
-
-***** Testing Altering table def scenario *****
-
-CREATE TABLE t2 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f7 DECIMAL(17,9) default '1000.00',
-f8 MEDIUMBLOB,
-f9 NUMERIC(6,4) default '2000.00',
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='InnoDB';
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-
-CREATE TABLE t3 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f8 MEDIUMBLOB,
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='InnoDB';
-
-CREATE TABLE t4 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 DECIMAL(17,9) default '1000.00',
-f7 MEDIUMBLOB,
-f8 NUMERIC(6,4) default '2000.00',
-f9 VARCHAR(1024),
-f10 BINARY(20) not null default '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f11 CHAR(255))
-ENGINE='InnoDB';
-Warnings:
-Warning	1264	Out of range value for column 'f8' at row 1
-
-CREATE TABLE t31 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5  BIGINT,
-f6  BLOB,
-f7  DATE,
-f8  DATETIME,
-f9  FLOAT,
-f10 INT,
-f11 LONGBLOB,
-f12 LONGTEXT,
-f13 MEDIUMBLOB,
-f14 MEDIUMINT,
-f15 MEDIUMTEXT,
-f16 REAL,
-f17 SMALLINT,
-f18 TEXT,
-f19 TIME,
-f20 TIMESTAMP,
-f21 TINYBLOB,
-f22 TINYINT,
-f23 TINYTEXT,
-f24 YEAR,
-f25 BINARY(255),
-f26 BIT(64),
-f27 CHAR(255),
-f28 DECIMAL(30,7),
-f29 DOUBLE,
-f30 ENUM ('a','b', 'c') default 'a',
-f31 FLOAT,
-f32 NUMERIC(17,9),
-f33 SET ('a', 'b', 'c') default 'b',
-f34 VARBINARY(1025),
-f35 VARCHAR(257)       
-) ENGINE='InnoDB';
-
-** Alter tables on slave and drop columns **
-
-alter table t2 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11, drop
-f12;
-alter table t3 drop f5, drop f6, drop f8, drop f10, drop f11, drop f12;
-alter table t4 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
-alter table t31 
-drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11,
-drop f12, drop f13, drop f14, drop f15, drop f16, drop f17, drop f18,
-drop f19, drop f20, drop f21, drop f22, drop f23, drop f24, drop f25,
-drop f26, drop f27, drop f28, drop f29, drop f30, drop f31, drop f32,
-drop f33, drop f34, drop f35;
-
-** Insert Data into Master **
-INSERT into t2 set f1=1, f2=1, f3=1, f4='first', f8='f8: medium size blob', f10='f10:
-some var char';
-INSERT into t2 values (2, 2, 2, 'second',
-2.0, 'b', 2000.0002, 'f8: medium size blob', 2000, 'f10: some var char',
-'01234567', 'c'),
-(3, 3, 3, 'third',
-3.0, 'b', 3000.0003, 'f8: medium size blob', 3000, 'f10: some var char',
-'01234567', 'c');
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-Warning	1264	Out of range value for column 'f9' at row 2
-INSERT into t3 set f1=1, f2=1, f3=1, f4='first', f10='f10: some var char';
-INSERT into t4 set f1=1, f2=1, f3=1, f4='first', f7='f7: medium size blob', f10='f10:
-binary data';
-INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
-INSERT into t31 set f1=1, f2=1, f3=2, f4='second',
-f9=2.2,  f10='seven samurai', f28=222.222, f35='222';
-Warnings:
-Warning	1366	Incorrect integer value: 'seven samurai' for column 'f10' at row 1
-INSERT into t31 values (1, 1, 3, 'third',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011', 
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-      );
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-INSERT into t31 values (1, 1, 4, 'fourth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 5, 'fifth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 6, 'sixth',
-/* f5  BIGINT,  */            NULL,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         NULL
-);
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-Warning	1264	Out of range value for column 'f5' at row 2
-Warning	1264	Out of range value for column 'f24' at row 2
-Warning	1264	Out of range value for column 'f24' at row 3
-
-** Sync slave with master ** 
-** Do selects from tables **
-
-select * from t1 order by f3;
-f1	f2	f3	f4
-2	2	2	second
-3	3	3	next
-5	5	5	second
-6	6	6	next
-8	8	8	second
-9	9	9	next
-11	11	11	second
-12	12	12	next
-14	14	14	second
-15	15	15	next
-17	17	17	second
-18	18	18	next
-20	20	20	second
-21	21	21	next
-23	23	23	second
-24	24	24	next
-26	26	26	second
-27	27	27	next
-29	29	29	second
-30	30	30	next
-31	31	31	second
-32	32	32	second
-33	33	33	second
-34	34	34	second
-35	35	35	second
-36	36	36	second
-37	37	37	second
-38	38	38	second
-39	39	39	second
-40	40	40	second
-41	41	41	second
-42	42	42	second
-43	43	43	second
-44	44	44	second
-45	45	45	second
-46	46	46	second
-47	47	47	second
-48	48	48	second
-49	49	49	second
-50	50	50	second
-select * from t2 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-2	2	2	second
-3	3	3	third
-select * from t3 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t4 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t31 order by f3;
-f1	f2	f3	f4
-1	1	1	first
-1	1	2	second
-1	1	3	third
-1	1	4	fourth
-1	1	5	fifth
-1	1	6	sixth
-
-** Do updates master **
-
-update t31 set f5=555555555555555 where f3=6;
-update t31 set f2=2 where f3=2;
-update t31 set f1=NULL where f3=1;
-update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
-Warnings:
-Warning	1048	Column 'f3' cannot be null
-
-** Delete from Master **
-
-delete from t1;
-delete from t2;
-delete from t3;
-delete from t4;
-delete from t31;
-
-** Check slave status **
-
-select * from t31;
-f1	f2	f3	f4
-show slave status;;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-
-****************************************
-* columns in master at middle of table *
-* Expect: Proper error message         *
-****************************************
-
-** Stop and Reset Slave **
-
-STOP SLAVE;
-RESET SLAVE;
-
-** create table slave side **
-CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
-) ENGINE='InnoDB';
-
-** Connect to master and create table **
-
-CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233',
-c CHAR(5), e INT DEFAULT '1')ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t10 () VALUES(1,@b1,DEFAULT,'Kyle',DEFAULT),
-(2,@b1,DEFAULT,'JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1523 ***
-********************************************
-
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-
-*** Drop t10  ***
-DROP TABLE t10;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: Proper error message              *
-*********************************************
-
-*** Create t11 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
-) ENGINE='InnoDB';
-
-*** Create t11 on Master ***
-CREATE TABLE t11 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT),
-(2,@b1,'Testing is cool','JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1523 ***
-********************************************
-
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-
-*** Drop t11  ***
-DROP TABLE t11;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: This one should pass blob-text    *
-*********************************************
-
-*** Create t12 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
-) ENGINE='InnoDB';
-
-*** Create t12 on Master ***
-CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t12 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',DEFAULT,DEFAULT),
-(3,@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT a,hex(b),f,c,e FROM t12 ORDER BY a;
-a	hex(b)	f	c	e
-1	62316231623162316231623162316231	Kyle	test	1
-2	62316231623162316231623162316231	JOE	test	1
-3	62316231623162316231623162316231	QA	test	1
-
-*** Select on Slave ***
-SELECT a,hex(b),c FROM t12 ORDER BY a;
-a	hex(b)	c
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-*** Drop t12  ***
-DROP TABLE t12;
-
-****************************************************
-* - Alter Master adding columns at middle of table *
-*   Expect: columns added                          *
-****************************************************
-
-
-*** Create t14 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t14 on Master ***
-CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t14 ADD COLUMN c2 DECIMAL(8,2) AFTER c1;
-ALTER TABLE t14 ADD COLUMN c3 TEXT AFTER c2;
-
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t14 () VALUES(1,1.00,'Replication Testing Extra Col',@b1,'Kyle',DEFAULT,DEFAULT),
-(2,2.00,'This Test Should work',@b1,'JOE',DEFAULT,DEFAULT),
-(3,3.00,'If is does not, I will open a bug',@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT c1,c2,c3,hex(c4),c5,c6,c7 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5	c6	c7
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP
-
-*** Select on Slave ****
-SELECT c1,c2,c3,hex(c4),c5 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA
-
-****************************************************
-* - Alter Master Dropping columns from the middle. *
-*   Expect: columns dropped                        *
-****************************************************
-
-*** connect to master and drop columns ***
-ALTER TABLE t14 DROP COLUMN c2;
-ALTER TABLE t14 DROP COLUMN c7;
-
-*** Select from Master ***
-SELECT c1,c3,hex(c4),c5,c6 FROM t14 ORDER BY c1;
-c1	c3	hex(c4)	c5	c6
-1	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1
-2	This Test Should work	62316231623162316231623162316231	JOE	1
-3	If is does not, I will open a bug	62316231623162316231623162316231	QA	1
-
-************
-* Bug30415 *
-************
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1091
-Last_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1091
-Last_SQL_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t14  ***
-DROP TABLE t14;
-DROP TABLE t14;
-RESET MASTER;
-START SLAVE;
-
-*************************************************
-* - Alter Master adding columns at end of table *
-*   Expect: Error 1054                          *
-*************************************************
-
-*** Create t15 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t15 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t15 on Master ***
-CREATE TABLE t15 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7;
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t15 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT,3.00),
-(2,@b1,'JOE',DEFAULT,DEFAULT,3.00),
-(3,@b1,'QA',DEFAULT,DEFAULT,3.00);
-SELECT c1,hex(c4),c5,c6,c7,c2 FROM t15 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7	c2
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP	3.00
-2	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP	3.00
-3	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP	3.00
-
-********************************************
-*** Expect slave to fail with Error 1054 ***
-********************************************
-
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1054
-Last_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1054
-Last_SQL_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t15  ***
-DROP TABLE t15;
-DROP TABLE t15;
-RESET MASTER;
-START SLAVE;
-
-************************************************
-* - Create index on Master column not on slave *
-*   Expect:Warning                             *
-************************************************
-
-*** Create t16 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t16 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t16 on Master ***
-CREATE TABLE t16 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Create Index and Data Insert ***
-CREATE INDEX part_of_c6 ON t16 (c6);
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t16 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t16 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-*****************
-*** BUG 30434 ***
-*****************
-
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1072
-Last_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1072
-Last_SQL_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Checking that both slave threads are running.
-
-***** Testing Altering table def scenario *****
-
-CREATE TABLE t2 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f7 DECIMAL(17,9) default '1000.00',
-f8 MEDIUMBLOB,
-f9 NUMERIC(6,4) default '2000.00',
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='InnoDB';
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-
-CREATE TABLE t3 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f8 MEDIUMBLOB,
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='InnoDB';
-
-CREATE TABLE t4 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 DECIMAL(17,9) default '1000.00',
-f7 MEDIUMBLOB,
-f8 NUMERIC(6,4) default '2000.00',
-f9 VARCHAR(1024),
-f10 BINARY(20) not null default '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f11 CHAR(255))
-ENGINE='InnoDB';
-Warnings:
-Warning	1264	Out of range value for column 'f8' at row 1
-
-CREATE TABLE t31 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5  BIGINT,
-f6  BLOB,
-f7  DATE,
-f8  DATETIME,
-f9  FLOAT,
-f10 INT,
-f11 LONGBLOB,
-f12 LONGTEXT,
-f13 MEDIUMBLOB,
-f14 MEDIUMINT,
-f15 MEDIUMTEXT,
-f16 REAL,
-f17 SMALLINT,
-f18 TEXT,
-f19 TIME,
-f20 TIMESTAMP,
-f21 TINYBLOB,
-f22 TINYINT,
-f23 TINYTEXT,
-f24 YEAR,
-f25 BINARY(255),
-f26 BIT(64),
-f27 CHAR(255),
-f28 DECIMAL(30,7),
-f29 DOUBLE,
-f30 ENUM ('a','b', 'c') default 'a',
-f31 FLOAT,
-f32 NUMERIC(17,9),
-f33 SET ('a', 'b', 'c') default 'b',
-f34 VARBINARY(1025),
-f35 VARCHAR(257)       
-) ENGINE='InnoDB';
-
-** Alter tables on slave and drop columns **
-
-alter table t2 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11, drop
-f12;
-alter table t3 drop f5, drop f6, drop f8, drop f10, drop f11, drop f12;
-alter table t4 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
-alter table t31 
-drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11,
-drop f12, drop f13, drop f14, drop f15, drop f16, drop f17, drop f18,
-drop f19, drop f20, drop f21, drop f22, drop f23, drop f24, drop f25,
-drop f26, drop f27, drop f28, drop f29, drop f30, drop f31, drop f32,
-drop f33, drop f34, drop f35;
-
-** Insert Data into Master **
-INSERT into t2 set f1=1, f2=1, f3=1, f4='first', f8='f8: medium size blob', f10='f10:
-some var char';
-INSERT into t2 values (2, 2, 2, 'second',
-2.0, 'b', 2000.0002, 'f8: medium size blob', 2000, 'f10: some var char',
-'01234567', 'c'),
-(3, 3, 3, 'third',
-3.0, 'b', 3000.0003, 'f8: medium size blob', 3000, 'f10: some var char',
-'01234567', 'c');
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-Warning	1264	Out of range value for column 'f9' at row 2
-INSERT into t3 set f1=1, f2=1, f3=1, f4='first', f10='f10: some var char';
-INSERT into t4 set f1=1, f2=1, f3=1, f4='first', f7='f7: medium size blob', f10='f10:
-binary data';
-INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
-INSERT into t31 set f1=1, f2=1, f3=2, f4='second',
-f9=2.2,  f10='seven samurai', f28=222.222, f35='222';
-Warnings:
-Warning	1366	Incorrect integer value: 'seven samurai' for column 'f10' at row 1
-INSERT into t31 values (1, 1, 3, 'third',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011', 
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-      );
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-INSERT into t31 values (1, 1, 4, 'fourth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 5, 'fifth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 6, 'sixth',
-/* f5  BIGINT,  */            NULL,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         NULL
-);
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-Warning	1264	Out of range value for column 'f5' at row 2
-Warning	1264	Out of range value for column 'f24' at row 2
-Warning	1264	Out of range value for column 'f24' at row 3
-
-** Sync slave with master ** 
-** Do selects from tables **
-
-select * from t1 order by f3;
-f1	f2	f3	f4
-2	2	2	second
-3	3	3	next
-5	5	5	second
-6	6	6	next
-8	8	8	second
-9	9	9	next
-11	11	11	second
-12	12	12	next
-14	14	14	second
-15	15	15	next
-17	17	17	second
-18	18	18	next
-20	20	20	second
-21	21	21	next
-23	23	23	second
-24	24	24	next
-26	26	26	second
-27	27	27	next
-29	29	29	second
-30	30	30	next
-31	31	31	second
-32	32	32	second
-33	33	33	second
-34	34	34	second
-35	35	35	second
-36	36	36	second
-37	37	37	second
-38	38	38	second
-39	39	39	second
-40	40	40	second
-41	41	41	second
-42	42	42	second
-43	43	43	second
-44	44	44	second
-45	45	45	second
-46	46	46	second
-47	47	47	second
-48	48	48	second
-49	49	49	second
-50	50	50	second
-select * from t2 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-2	2	2	second
-3	3	3	third
-select * from t3 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t4 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t31 order by f3;
-f1	f2	f3	f4
-1	1	1	first
-1	1	2	second
-1	1	3	third
-1	1	4	fourth
-1	1	5	fifth
-1	1	6	sixth
-
-** Do updates master **
-
-update t31 set f5=555555555555555 where f3=6;
-update t31 set f2=2 where f3=2;
-update t31 set f1=NULL where f3=1;
-update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
-Warnings:
-Warning	1048	Column 'f3' cannot be null
-
-** Delete from Master **
-
-delete from t1;
-delete from t2;
-delete from t3;
-delete from t4;
-delete from t31;
-select * from t31;
-f1	f2	f3	f4
-
-** Check slave status **
-
-Checking that both slave threads are running.
-
-****************************************
-* columns in master at middle of table *
-* Expect: Proper error message         *
-****************************************
-
-** Stop and Reset Slave **
-
-STOP SLAVE;
-RESET SLAVE;
-
-** create table slave side **
-CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
-) ENGINE='InnoDB';
-
-** Connect to master and create table **
-
-CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233',
-c CHAR(5), e INT DEFAULT '1')ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t10 () VALUES(1,@b1,DEFAULT,'Kyle',DEFAULT),
-(2,@b1,DEFAULT,'JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1535 ***
-********************************************
-
---source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
-include/start_slave.inc
-
-*** Drop t10  ***
-DROP TABLE t10;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: Proper error message              *
-*********************************************
-
-*** Create t11 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
-) ENGINE='InnoDB';
-
-*** Create t11 on Master ***
-CREATE TABLE t11 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT),
-(2,@b1,'Testing is cool','JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1535 ***
-********************************************
-
---source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
-include/start_slave.inc
-
-*** Drop t11  ***
-DROP TABLE t11;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: This one should pass blob-text    *
-*********************************************
-
-*** Create t12 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
-) ENGINE='InnoDB';
-
-*** Create t12 on Master ***
-CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t12 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',DEFAULT,DEFAULT),
-(3,@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT a,hex(b),f,c,e FROM t12 ORDER BY a;
-a	hex(b)	f	c	e
-1	62316231623162316231623162316231	Kyle	test	1
-2	62316231623162316231623162316231	JOE	test	1
-3	62316231623162316231623162316231	QA	test	1
-
-*** Select on Slave ***
-SELECT a,hex(b),c FROM t12 ORDER BY a;
-a	hex(b)	c
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-*** Drop t12  ***
-DROP TABLE t12;
-
-****************************************************
-* - Alter Master adding columns at middle of table *
-*   Expect: columns added                          *
-****************************************************
-
-
-*** Create t14 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t14 on Master ***
-CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t14 ADD COLUMN c2 DECIMAL(8,2) AFTER c1;
-ALTER TABLE t14 ADD COLUMN c3 TEXT AFTER c2;
-
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t14 () VALUES(1,1.00,'Replication Testing Extra Col',@b1,'Kyle',DEFAULT,DEFAULT),
-(2,2.00,'This Test Should work',@b1,'JOE',DEFAULT,DEFAULT),
-(3,3.00,'If is does not, I will open a bug',@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT c1,c2,c3,hex(c4),c5,c6,c7 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5	c6	c7
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP
-
-*** Select on Slave ****
-SELECT c1,c2,c3,hex(c4),c5 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA
-
-****************************************************
-* - Alter Master Dropping columns from the middle. *
-*   Expect: columns dropped                        *
-****************************************************
-
-*** connect to master and drop columns ***
-ALTER TABLE t14 DROP COLUMN c2;
-ALTER TABLE t14 DROP COLUMN c7;
-
-*** Select from Master ***
-SELECT c1,c3,hex(c4),c5,c6 FROM t14 ORDER BY c1;
-c1	c3	hex(c4)	c5	c6
-1	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1
-2	This Test Should work	62316231623162316231623162316231	JOE	1
-3	If is does not, I will open a bug	62316231623162316231623162316231	QA	1
-
-************
-* Bug30415 *
-************
-Last_SQL_Error = Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t14  ***
-DROP TABLE t14;
-DROP TABLE t14;
-RESET MASTER;
-START SLAVE;
-
-*************************************************
-* - Alter Master adding columns at end of table *
-*   Expect: Error 1054                          *
-*************************************************
-
-*** Create t15 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t15 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t15 on Master ***
-CREATE TABLE t15 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7;
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t15 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT,3.00),
-(2,@b1,'JOE',DEFAULT,DEFAULT,3.00),
-(3,@b1,'QA',DEFAULT,DEFAULT,3.00);
-SELECT c1,hex(c4),c5,c6,c7,c2 FROM t15 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7	c2
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP	3.00
-2	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP	3.00
-3	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP	3.00
-
-********************************************
-*** Expect slave to fail with Error 1054 ***
-********************************************
-
-Last_SQL_Error = Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t15  ***
-DROP TABLE t15;
-DROP TABLE t15;
-RESET MASTER;
-START SLAVE;
-
-************************************************
-* - Create index on Master column not on slave *
-*   Expect:Warning                             *
-************************************************
-
-*** Create t16 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t16 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t16 on Master ***
-CREATE TABLE t16 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Create Index and Data Insert ***
-CREATE INDEX part_of_c6 ON t16 (c6);
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t16 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t16 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-*****************
-*** BUG 30434 ***
-*****************
-
-Last_SQL_Error = Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t16  ***
-DROP TABLE t16;
-DROP TABLE t16;
-RESET MASTER;
-START SLAVE;
-
-*****************************************************
-* - Delete rows using column on Master not on slave *
-*   Expect: Rows Deleted                            *
-*****************************************************
-
-*** Create t17 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t17 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t17 on Master ***
-CREATE TABLE t17 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t17 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-** Delete from master **
-DELETE FROM t17 WHERE c6 = 3;
-SELECT c1,hex(c4),c5,c6,c7 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-
-** Check slave **
-SELECT c1,hex(c4),c5 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-DROP TABLE t17;
-
-
-*****************************************************
-* - Update row using column on Master not on slave *
-*   Expect: Rows updated                           *
-*****************************************************
-
-** Bug30674 **
-
-*** Create t18 on slave  ***
-
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t18 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t18 on Master ***
-CREATE TABLE t18 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t18 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-** update from master **
-UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
-SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
-
-** Check slave **
-SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	TEST
-DROP TABLE t18;
-
-
-*****************************************************
-* - Insert UUID  column on Master not on slave *
-*   Expect: Rows inserted                      *
-*****************************************************
-
-*** Create t5 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t5 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t5 on Master ***
-CREATE TABLE t5 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 LONG, 
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-INSERT INTO t5 () VALUES(1,@b1,'Kyle',UUID(),DEFAULT),
-(2,@b1,'JOE',UUID(),DEFAULT),
-(3,@b1,'QA',UUID(),DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t5 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	6231623162316231	Kyle	UUID	TIME
-2	6231623162316231	JOE	UUID	TIME
-3	6231623162316231	QA	UUID	TIME
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t5 ORDER BY c1;
-c1	hex(c4)	c5
-1	6231623162316231	Kyle
-2	6231623162316231	JOE
-3	6231623162316231	QA
-DROP TABLE t5;
-
-set binlog_format=statement;
-
-***********************************************************
-***********************************************************
-***************** Start of Testing ************************
-***********************************************************
-***********************************************************
-* This test format == binlog_format	STATEMENT and engine == 'InnoDB'
-***********************************************************
-***********************************************************
-
-***** Testing more columns on the Master *****
-
-CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 FLOAT DEFAULT '2.00', 
-f6 CHAR(4) DEFAULT 'TEST',
-f7 INT DEFAULT '0',
-f8 TEXT,
-f9 LONGBLOB,
-f10 BIT(63),
-f11 VARBINARY(64))ENGINE='InnoDB';
-
-* Alter Table on Slave and drop columns f5 through f11 *
-
-alter table t1 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
-
-* Insert data in Master then update and delete some rows*
-
-* Select count and 20 rows from Master *
-
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-40
-
-SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9,
-hex(f10),hex(f11) FROM t1 ORDER BY f3 LIMIT 20;
-f1	f2	f3	f4	f5	f6	f7	f8	f9	hex(f10)	hex(f11)
-2	2	2	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-3	3	3	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-5	5	5	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-6	6	6	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-8	8	8	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-9	9	9	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-11	11	11	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-12	12	12	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-14	14	14	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-15	15	15	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-17	17	17	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-18	18	18	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-20	20	20	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-21	21	21	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-23	23	23	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-24	24	24	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-26	26	26	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-27	27	27	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-29	29	29	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-30	30	30	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-
-* Select count and 20 rows from Slave *
-
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-40
-
-SELECT * FROM t1 ORDER BY f3 LIMIT 20;
-f1	f2	f3	f4
-2	2	2	second
-3	3	3	next
-5	5	5	second
-6	6	6	next
-8	8	8	second
-9	9	9	next
-11	11	11	second
-12	12	12	next
-14	14	14	second
-15	15	15	next
-17	17	17	second
-18	18	18	next
-20	20	20	second
-21	21	21	next
-23	23	23	second
-24	24	24	next
-26	26	26	second
-27	27	27	next
-29	29	29	second
-30	30	30	next
-Checking that both slave threads are running.
-
-***** Testing Altering table def scenario *****
-
-CREATE TABLE t2 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f7 DECIMAL(17,9) default '1000.00',
-f8 MEDIUMBLOB,
-f9 NUMERIC(6,4) default '2000.00',
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='InnoDB';
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-
-CREATE TABLE t3 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f8 MEDIUMBLOB,
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='InnoDB';
-
-CREATE TABLE t4 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 DECIMAL(17,9) default '1000.00',
-f7 MEDIUMBLOB,
-f8 NUMERIC(6,4) default '2000.00',
-f9 VARCHAR(1024),
-f10 BINARY(20) not null default '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f11 CHAR(255))
-ENGINE='InnoDB';
-Warnings:
-Warning	1264	Out of range value for column 'f8' at row 1
-
-CREATE TABLE t31 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5  BIGINT,
-f6  BLOB,
-f7  DATE,
-f8  DATETIME,
-f9  FLOAT,
-f10 INT,
-f11 LONGBLOB,
-f12 LONGTEXT,
-f13 MEDIUMBLOB,
-f14 MEDIUMINT,
-f15 MEDIUMTEXT,
-f16 REAL,
-f17 SMALLINT,
-f18 TEXT,
-f19 TIME,
-f20 TIMESTAMP,
-f21 TINYBLOB,
-f22 TINYINT,
-f23 TINYTEXT,
-f24 YEAR,
-f25 BINARY(255),
-f26 BIT(64),
-f27 CHAR(255),
-f28 DECIMAL(30,7),
-f29 DOUBLE,
-f30 ENUM ('a','b', 'c') default 'a',
-f31 FLOAT,
-f32 NUMERIC(17,9),
-f33 SET ('a', 'b', 'c') default 'b',
-f34 VARBINARY(1025),
-f35 VARCHAR(257)       
-) ENGINE='InnoDB';
-
-** Alter tables on slave and drop columns **
-
-alter table t2 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11, drop
-f12;
-alter table t3 drop f5, drop f6, drop f8, drop f10, drop f11, drop f12;
-alter table t4 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
-alter table t31 
-drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11,
-drop f12, drop f13, drop f14, drop f15, drop f16, drop f17, drop f18,
-drop f19, drop f20, drop f21, drop f22, drop f23, drop f24, drop f25,
-drop f26, drop f27, drop f28, drop f29, drop f30, drop f31, drop f32,
-drop f33, drop f34, drop f35;
-
-** Insert Data into Master **
-INSERT into t2 set f1=1, f2=1, f3=1, f4='first', f8='f8: medium size blob', f10='f10:
-some var char';
-INSERT into t2 values (2, 2, 2, 'second',
-2.0, 'b', 2000.0002, 'f8: medium size blob', 2000, 'f10: some var char',
-'01234567', 'c'),
-(3, 3, 3, 'third',
-3.0, 'b', 3000.0003, 'f8: medium size blob', 3000, 'f10: some var char',
-'01234567', 'c');
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-Warning	1264	Out of range value for column 'f9' at row 2
-INSERT into t3 set f1=1, f2=1, f3=1, f4='first', f10='f10: some var char';
-INSERT into t4 set f1=1, f2=1, f3=1, f4='first', f7='f7: medium size blob', f10='f10:
-binary data';
-INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
-INSERT into t31 set f1=1, f2=1, f3=2, f4='second',
-f9=2.2,  f10='seven samurai', f28=222.222, f35='222';
-Warnings:
-Warning	1366	Incorrect integer value: 'seven samurai' for column 'f10' at row 1
-INSERT into t31 values (1, 1, 3, 'third',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011', 
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-      );
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-INSERT into t31 values (1, 1, 4, 'fourth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 5, 'fifth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 6, 'sixth',
-/* f5  BIGINT,  */            NULL,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         NULL
-);
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-Warning	1264	Out of range value for column 'f5' at row 2
-Warning	1264	Out of range value for column 'f24' at row 2
-Warning	1264	Out of range value for column 'f24' at row 3
-
-** Sync slave with master ** 
-** Do selects from tables **
-
-select * from t1 order by f3;
-f1	f2	f3	f4
-2	2	2	second
-3	3	3	next
-5	5	5	second
-6	6	6	next
-8	8	8	second
-9	9	9	next
-11	11	11	second
-12	12	12	next
-14	14	14	second
-15	15	15	next
-17	17	17	second
-18	18	18	next
-20	20	20	second
-21	21	21	next
-23	23	23	second
-24	24	24	next
-26	26	26	second
-27	27	27	next
-29	29	29	second
-30	30	30	next
-31	31	31	second
-32	32	32	second
-33	33	33	second
-34	34	34	second
-35	35	35	second
-36	36	36	second
-37	37	37	second
-38	38	38	second
-39	39	39	second
-40	40	40	second
-41	41	41	second
-42	42	42	second
-43	43	43	second
-44	44	44	second
-45	45	45	second
-46	46	46	second
-47	47	47	second
-48	48	48	second
-49	49	49	second
-50	50	50	second
-select * from t2 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-2	2	2	second
-3	3	3	third
-select * from t3 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t4 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t31 order by f3;
-f1	f2	f3	f4
-1	1	1	first
-1	1	2	second
-1	1	3	third
-1	1	4	fourth
-1	1	5	fifth
-1	1	6	sixth
-
-** Do updates master **
-
-update t31 set f5=555555555555555 where f3=6;
-update t31 set f2=2 where f3=2;
-update t31 set f1=NULL where f3=1;
-update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
-Warnings:
-Warning	1048	Column 'f3' cannot be null
-
-** Delete from Master **
-
-delete from t1;
-delete from t2;
-delete from t3;
-delete from t4;
-delete from t31;
-select * from t31;
-f1	f2	f3	f4
-
-** Check slave status **
-
-Checking that both slave threads are running.
-
-****************************************
-* columns in master at middle of table *
-* Expect: Proper error message         *
-****************************************
-
-** Stop and Reset Slave **
-
-STOP SLAVE;
-RESET SLAVE;
-
-** create table slave side **
-CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
-) ENGINE='InnoDB';
-
-** Connect to master and create table **
-
-CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233',
-c CHAR(5), e INT DEFAULT '1')ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t10 () VALUES(1,@b1,DEFAULT,'Kyle',DEFAULT),
-(2,@b1,DEFAULT,'JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1535 ***
-********************************************
-
---source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
-include/start_slave.inc
-
-*** Drop t10  ***
-DROP TABLE t10;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: Proper error message              *
-*********************************************
-
-*** Create t11 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
-) ENGINE='InnoDB';
-
-*** Create t11 on Master ***
-CREATE TABLE t11 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT),
-(2,@b1,'Testing is cool','JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1535 ***
-********************************************
-
---source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
-include/start_slave.inc
-
-*** Drop t11  ***
-DROP TABLE t11;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: This one should pass blob-text    *
-*********************************************
-
-*** Create t12 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
-) ENGINE='InnoDB';
-
-*** Create t12 on Master ***
-CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t12 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',DEFAULT,DEFAULT),
-(3,@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT a,hex(b),f,c,e FROM t12 ORDER BY a;
-a	hex(b)	f	c	e
-1	62316231623162316231623162316231	Kyle	test	1
-2	62316231623162316231623162316231	JOE	test	1
-3	62316231623162316231623162316231	QA	test	1
-
-*** Select on Slave ***
-SELECT a,hex(b),c FROM t12 ORDER BY a;
-a	hex(b)	c
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-*** Drop t12  ***
-DROP TABLE t12;
-
-****************************************************
-* - Alter Master adding columns at middle of table *
-*   Expect: columns added                          *
-****************************************************
-
-
-*** Create t14 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t14 on Master ***
-CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t14 ADD COLUMN c2 DECIMAL(8,2) AFTER c1;
-ALTER TABLE t14 ADD COLUMN c3 TEXT AFTER c2;
-
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t14 () VALUES(1,1.00,'Replication Testing Extra Col',@b1,'Kyle',DEFAULT,DEFAULT),
-(2,2.00,'This Test Should work',@b1,'JOE',DEFAULT,DEFAULT),
-(3,3.00,'If is does not, I will open a bug',@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT c1,c2,c3,hex(c4),c5,c6,c7 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5	c6	c7
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP
-
-*** Select on Slave ****
-SELECT c1,c2,c3,hex(c4),c5 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA
-
-****************************************************
-* - Alter Master Dropping columns from the middle. *
-*   Expect: columns dropped                        *
-****************************************************
-
-*** connect to master and drop columns ***
-ALTER TABLE t14 DROP COLUMN c2;
-ALTER TABLE t14 DROP COLUMN c7;
-
-*** Select from Master ***
-SELECT c1,c3,hex(c4),c5,c6 FROM t14 ORDER BY c1;
-c1	c3	hex(c4)	c5	c6
-1	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1
-2	This Test Should work	62316231623162316231623162316231	JOE	1
-3	If is does not, I will open a bug	62316231623162316231623162316231	QA	1
-
-************
-* Bug30415 *
-************
-Last_SQL_Error = Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t14  ***
-DROP TABLE t14;
-DROP TABLE t14;
-RESET MASTER;
-START SLAVE;
-
-*************************************************
-* - Alter Master adding columns at end of table *
-*   Expect: Error 1054                          *
-*************************************************
-
-*** Create t15 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t15 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t15 on Master ***
-CREATE TABLE t15 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7;
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t15 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT,3.00),
-(2,@b1,'JOE',DEFAULT,DEFAULT,3.00),
-(3,@b1,'QA',DEFAULT,DEFAULT,3.00);
-SELECT c1,hex(c4),c5,c6,c7,c2 FROM t15 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7	c2
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP	3.00
-2	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP	3.00
-3	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP	3.00
-
-********************************************
-*** Expect slave to fail with Error 1054 ***
-********************************************
-
-Last_SQL_Error = Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t15  ***
-DROP TABLE t15;
-DROP TABLE t15;
-RESET MASTER;
-START SLAVE;
-
-************************************************
-* - Create index on Master column not on slave *
-*   Expect:Warning                             *
-************************************************
-
-*** Create t16 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t16 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t16 on Master ***
-CREATE TABLE t16 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Create Index and Data Insert ***
-CREATE INDEX part_of_c6 ON t16 (c6);
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t16 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t16 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-*****************
-*** BUG 30434 ***
-*****************
-
-Last_SQL_Error = Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t16  ***
-DROP TABLE t16;
-DROP TABLE t16;
-RESET MASTER;
-START SLAVE;
-
-*****************************************************
-* - Delete rows using column on Master not on slave *
-*   Expect: Rows Deleted                            *
-*****************************************************
-
-*** Create t17 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t17 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t17 on Master ***
-CREATE TABLE t17 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t17 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-** Delete from master **
-DELETE FROM t17 WHERE c6 = 3;
-SELECT c1,hex(c4),c5,c6,c7 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-
-** Check slave **
-SELECT c1,hex(c4),c5 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-DROP TABLE t17;
-
-
-*****************************************************
-* - Update row using column on Master not on slave *
-*   Expect: Rows updated                           *
-*****************************************************
-
-** Bug30674 **
-
-*** Create t18 on slave  ***
-
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t18 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t18 on Master ***
-CREATE TABLE t18 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t18 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-** update from master **
-UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
-SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
-
-** Check slave **
-SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	TEST
-DROP TABLE t18;
-
-
-*****************************************************
-* - Insert UUID  column on Master not on slave *
-*   Expect: Rows inserted                      *
-*****************************************************
-
-*** Create t5 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t5 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='InnoDB';
-
-*** Create t5 on Master ***
-CREATE TABLE t5 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 LONG, 
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='InnoDB';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-INSERT INTO t5 () VALUES(1,@b1,'Kyle',UUID(),DEFAULT),
-(2,@b1,'JOE',UUID(),DEFAULT),
-(3,@b1,'QA',UUID(),DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t5 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	6231623162316231	Kyle	UUID	TIME
-2	6231623162316231	JOE	UUID	TIME
-3	6231623162316231	QA	UUID	TIME
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t5 ORDER BY c1;
-c1	hex(c4)	c5
-1	6231623162316231	Kyle
-2	6231623162316231	JOE
-3	6231623162316231	QA
-DROP TABLE t5;
-
-set binlog_format=mixed;
-
-***********************************************************
-***********************************************************
-***************** Start of Testing ************************
-***********************************************************
-***********************************************************
-* This test format == binlog_format	MIXED and engine == 'InnoDB'
-***********************************************************
-***********************************************************
-
-***** Testing more columns on the Master *****
-
-CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 FLOAT DEFAULT '2.00', 
-f6 CHAR(4) DEFAULT 'TEST',
-f7 INT DEFAULT '0',
-f8 TEXT,
-f9 LONGBLOB,
-f10 BIT(63),
-f11 VARBINARY(64))ENGINE='InnoDB';
-
-* Alter Table on Slave and drop columns f5 through f11 *
-
-alter table t1 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
-
-* Insert data in Master then update and delete some rows*
-
-* Select count and 20 rows from Master *
-
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-40
-
-SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9,
-hex(f10),hex(f11) FROM t1 ORDER BY f3 LIMIT 20;
-f1	f2	f3	f4	f5	f6	f7	f8	f9	hex(f10)	hex(f11)
-2	2	2	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-3	3	3	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-5	5	5	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-6	6	6	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-8	8	8	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-9	9	9	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-11	11	11	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-12	12	12	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-14	14	14	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-15	15	15	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-17	17	17	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-18	18	18	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-20	20	20	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-21	21	21	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-23	23	23	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-24	24	24	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-26	26	26	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-27	27	27	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-29	29	29	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-30	30	30	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-
-* Select count and 20 rows from Slave *
-
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-40
-
-SELECT * FROM t1 ORDER BY f3 LIMIT 20;
-f1	f2	f3	f4
-2	2	2	second
-3	3	3	next
-5	5	5	second
-6	6	6	next
-8	8	8	second
-9	9	9	next
-11	11	11	second
-12	12	12	next
-14	14	14	second
-15	15	15	next
-17	17	17	second
-18	18	18	next
-20	20	20	second
-21	21	21	next
-23	23	23	second
-24	24	24	next
-26	26	26	second
-27	27	27	next
-29	29	29	second
-30	30	30	next
 Checking that both slave threads are running.
 
 ***** Testing Altering table def scenario *****
@@ -3112,11 +460,11 @@ INSERT INTO t10 () VALUES(1,@b1,DEFAULT,
 (3,@b1,DEFAULT,'QA',DEFAULT);
 
 ********************************************
-*** Expect slave to fail with Error 1535 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
 
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
 
@@ -3150,11 +498,11 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing
 (3,@b1,DEFAULT,'QA',DEFAULT);
 
 ********************************************
-*** Expect slave to fail with Error 1535 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
 
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
 
@@ -3364,7 +712,6 @@ c1	hex(c4)	c5	c6	c7
 *****************
 
 Last_SQL_Error = Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
->>>>>>> MERGE-SOURCE
 STOP SLAVE;
 RESET SLAVE;
 

=== modified file 'mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result	2010-06-18 11:10:53 +0000
@@ -90,2658 +90,6 @@ f1	f2	f3	f4
 27	27	27	next
 29	29	29	second
 30	30	30	next
-<<<<<<< TREE
-
-* Show Slave Status *
-
-show slave status;;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-
-
-***** Testing Altering table def scenario *****
-
-CREATE TABLE t2 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f7 DECIMAL(17,9) default '1000.00',
-f8 MEDIUMBLOB,
-f9 NUMERIC(6,4) default '2000.00',
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='MyISAM';
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-
-CREATE TABLE t3 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f8 MEDIUMBLOB,
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='MyISAM';
-
-CREATE TABLE t4 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 DECIMAL(17,9) default '1000.00',
-f7 MEDIUMBLOB,
-f8 NUMERIC(6,4) default '2000.00',
-f9 VARCHAR(1024),
-f10 BINARY(20) not null default '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f11 CHAR(255))
-ENGINE='MyISAM';
-Warnings:
-Warning	1264	Out of range value for column 'f8' at row 1
-
-CREATE TABLE t31 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5  BIGINT,
-f6  BLOB,
-f7  DATE,
-f8  DATETIME,
-f9  FLOAT,
-f10 INT,
-f11 LONGBLOB,
-f12 LONGTEXT,
-f13 MEDIUMBLOB,
-f14 MEDIUMINT,
-f15 MEDIUMTEXT,
-f16 REAL,
-f17 SMALLINT,
-f18 TEXT,
-f19 TIME,
-f20 TIMESTAMP,
-f21 TINYBLOB,
-f22 TINYINT,
-f23 TINYTEXT,
-f24 YEAR,
-f25 BINARY(255),
-f26 BIT(64),
-f27 CHAR(255),
-f28 DECIMAL(30,7),
-f29 DOUBLE,
-f30 ENUM ('a','b', 'c') default 'a',
-f31 FLOAT,
-f32 NUMERIC(17,9),
-f33 SET ('a', 'b', 'c') default 'b',
-f34 VARBINARY(1025),
-f35 VARCHAR(257)       
-) ENGINE='MyISAM';
-
-** Alter tables on slave and drop columns **
-
-alter table t2 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11, drop
-f12;
-alter table t3 drop f5, drop f6, drop f8, drop f10, drop f11, drop f12;
-alter table t4 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
-alter table t31 
-drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11,
-drop f12, drop f13, drop f14, drop f15, drop f16, drop f17, drop f18,
-drop f19, drop f20, drop f21, drop f22, drop f23, drop f24, drop f25,
-drop f26, drop f27, drop f28, drop f29, drop f30, drop f31, drop f32,
-drop f33, drop f34, drop f35;
-
-** Insert Data into Master **
-INSERT into t2 set f1=1, f2=1, f3=1, f4='first', f8='f8: medium size blob', f10='f10:
-some var char';
-INSERT into t2 values (2, 2, 2, 'second',
-2.0, 'b', 2000.0002, 'f8: medium size blob', 2000, 'f10: some var char',
-'01234567', 'c'),
-(3, 3, 3, 'third',
-3.0, 'b', 3000.0003, 'f8: medium size blob', 3000, 'f10: some var char',
-'01234567', 'c');
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-Warning	1264	Out of range value for column 'f9' at row 2
-INSERT into t3 set f1=1, f2=1, f3=1, f4='first', f10='f10: some var char';
-INSERT into t4 set f1=1, f2=1, f3=1, f4='first', f7='f7: medium size blob', f10='f10:
-binary data';
-INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
-INSERT into t31 set f1=1, f2=1, f3=2, f4='second',
-f9=2.2,  f10='seven samurai', f28=222.222, f35='222';
-Warnings:
-Warning	1366	Incorrect integer value: 'seven samurai' for column 'f10' at row 1
-INSERT into t31 values (1, 1, 3, 'third',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011', 
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-      );
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-INSERT into t31 values (1, 1, 4, 'fourth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 5, 'fifth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 6, 'sixth',
-/* f5  BIGINT,  */            NULL,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         NULL
-);
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-Warning	1264	Out of range value for column 'f5' at row 2
-Warning	1264	Out of range value for column 'f24' at row 2
-Warning	1264	Out of range value for column 'f24' at row 3
-
-** Sync slave with master ** 
-** Do selects from tables **
-
-select * from t1 order by f3;
-f1	f2	f3	f4
-2	2	2	second
-3	3	3	next
-5	5	5	second
-6	6	6	next
-8	8	8	second
-9	9	9	next
-11	11	11	second
-12	12	12	next
-14	14	14	second
-15	15	15	next
-17	17	17	second
-18	18	18	next
-20	20	20	second
-21	21	21	next
-23	23	23	second
-24	24	24	next
-26	26	26	second
-27	27	27	next
-29	29	29	second
-30	30	30	next
-31	31	31	second
-32	32	32	second
-33	33	33	second
-34	34	34	second
-35	35	35	second
-36	36	36	second
-37	37	37	second
-38	38	38	second
-39	39	39	second
-40	40	40	second
-41	41	41	second
-42	42	42	second
-43	43	43	second
-44	44	44	second
-45	45	45	second
-46	46	46	second
-47	47	47	second
-48	48	48	second
-49	49	49	second
-50	50	50	second
-select * from t2 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-2	2	2	second
-3	3	3	third
-select * from t3 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t4 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t31 order by f3;
-f1	f2	f3	f4
-1	1	1	first
-1	1	2	second
-1	1	3	third
-1	1	4	fourth
-1	1	5	fifth
-1	1	6	sixth
-
-** Do updates master **
-
-update t31 set f5=555555555555555 where f3=6;
-update t31 set f2=2 where f3=2;
-update t31 set f1=NULL where f3=1;
-update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
-Warnings:
-Warning	1048	Column 'f3' cannot be null
-
-** Delete from Master **
-
-delete from t1;
-delete from t2;
-delete from t3;
-delete from t4;
-delete from t31;
-
-** Check slave status **
-
-select * from t31;
-f1	f2	f3	f4
-show slave status;;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-
-****************************************
-* columns in master at middle of table *
-* Expect: Proper error message         *
-****************************************
-
-** Stop and Reset Slave **
-
-STOP SLAVE;
-RESET SLAVE;
-
-** create table slave side **
-CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
-) ENGINE='MyISAM';
-
-** Connect to master and create table **
-
-CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233',
-c CHAR(5), e INT DEFAULT '1')ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t10 () VALUES(1,@b1,DEFAULT,'Kyle',DEFAULT),
-(2,@b1,DEFAULT,'JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1523 ***
-********************************************
-
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-
-*** Drop t10  ***
-DROP TABLE t10;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: Proper error message              *
-*********************************************
-
-*** Create t11 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
-) ENGINE='MyISAM';
-
-*** Create t11 on Master ***
-CREATE TABLE t11 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT),
-(2,@b1,'Testing is cool','JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1523 ***
-********************************************
-
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-
-*** Drop t11  ***
-DROP TABLE t11;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: This one should pass blob-text    *
-*********************************************
-
-*** Create t12 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
-) ENGINE='MyISAM';
-
-*** Create t12 on Master ***
-CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t12 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',DEFAULT,DEFAULT),
-(3,@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT a,hex(b),f,c,e FROM t12 ORDER BY a;
-a	hex(b)	f	c	e
-1	62316231623162316231623162316231	Kyle	test	1
-2	62316231623162316231623162316231	JOE	test	1
-3	62316231623162316231623162316231	QA	test	1
-
-*** Select on Slave ***
-SELECT a,hex(b),c FROM t12 ORDER BY a;
-a	hex(b)	c
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-*** Drop t12  ***
-DROP TABLE t12;
-
-****************************************************
-* - Alter Master adding columns at middle of table *
-*   Expect: columns added                          *
-****************************************************
-
-
-*** Create t14 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t14 on Master ***
-CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t14 ADD COLUMN c2 DECIMAL(8,2) AFTER c1;
-ALTER TABLE t14 ADD COLUMN c3 TEXT AFTER c2;
-
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t14 () VALUES(1,1.00,'Replication Testing Extra Col',@b1,'Kyle',DEFAULT,DEFAULT),
-(2,2.00,'This Test Should work',@b1,'JOE',DEFAULT,DEFAULT),
-(3,3.00,'If is does not, I will open a bug',@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT c1,c2,c3,hex(c4),c5,c6,c7 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5	c6	c7
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP
-
-*** Select on Slave ****
-SELECT c1,c2,c3,hex(c4),c5 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA
-
-****************************************************
-* - Alter Master Dropping columns from the middle. *
-*   Expect: columns dropped                        *
-****************************************************
-
-*** connect to master and drop columns ***
-ALTER TABLE t14 DROP COLUMN c2;
-ALTER TABLE t14 DROP COLUMN c7;
-
-*** Select from Master ***
-SELECT c1,c3,hex(c4),c5,c6 FROM t14 ORDER BY c1;
-c1	c3	hex(c4)	c5	c6
-1	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1
-2	This Test Should work	62316231623162316231623162316231	JOE	1
-3	If is does not, I will open a bug	62316231623162316231623162316231	QA	1
-
-************
-* Bug30415 *
-************
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1091
-Last_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1091
-Last_SQL_Error	Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t14  ***
-DROP TABLE t14;
-DROP TABLE t14;
-RESET MASTER;
-START SLAVE;
-
-*************************************************
-* - Alter Master adding columns at end of table *
-*   Expect: Error 1054                          *
-*************************************************
-
-*** Create t15 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t15 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t15 on Master ***
-CREATE TABLE t15 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7;
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t15 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT,3.00),
-(2,@b1,'JOE',DEFAULT,DEFAULT,3.00),
-(3,@b1,'QA',DEFAULT,DEFAULT,3.00);
-SELECT c1,hex(c4),c5,c6,c7,c2 FROM t15 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7	c2
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP	3.00
-2	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP	3.00
-3	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP	3.00
-
-********************************************
-*** Expect slave to fail with Error 1054 ***
-********************************************
-
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1054
-Last_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1054
-Last_SQL_Error	Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t15  ***
-DROP TABLE t15;
-DROP TABLE t15;
-RESET MASTER;
-START SLAVE;
-
-************************************************
-* - Create index on Master column not on slave *
-*   Expect:Warning                             *
-************************************************
-
-*** Create t16 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t16 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t16 on Master ***
-CREATE TABLE t16 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Create Index and Data Insert ***
-CREATE INDEX part_of_c6 ON t16 (c6);
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t16 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t16 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-*****************
-*** BUG 30434 ***
-*****************
-
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1072
-Last_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1072
-Last_SQL_Error	Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Checking that both slave threads are running.
-
-***** Testing Altering table def scenario *****
-
-CREATE TABLE t2 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f7 DECIMAL(17,9) default '1000.00',
-f8 MEDIUMBLOB,
-f9 NUMERIC(6,4) default '2000.00',
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='MyISAM';
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-
-CREATE TABLE t3 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f8 MEDIUMBLOB,
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='MyISAM';
-
-CREATE TABLE t4 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 DECIMAL(17,9) default '1000.00',
-f7 MEDIUMBLOB,
-f8 NUMERIC(6,4) default '2000.00',
-f9 VARCHAR(1024),
-f10 BINARY(20) not null default '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f11 CHAR(255))
-ENGINE='MyISAM';
-Warnings:
-Warning	1264	Out of range value for column 'f8' at row 1
-
-CREATE TABLE t31 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5  BIGINT,
-f6  BLOB,
-f7  DATE,
-f8  DATETIME,
-f9  FLOAT,
-f10 INT,
-f11 LONGBLOB,
-f12 LONGTEXT,
-f13 MEDIUMBLOB,
-f14 MEDIUMINT,
-f15 MEDIUMTEXT,
-f16 REAL,
-f17 SMALLINT,
-f18 TEXT,
-f19 TIME,
-f20 TIMESTAMP,
-f21 TINYBLOB,
-f22 TINYINT,
-f23 TINYTEXT,
-f24 YEAR,
-f25 BINARY(255),
-f26 BIT(64),
-f27 CHAR(255),
-f28 DECIMAL(30,7),
-f29 DOUBLE,
-f30 ENUM ('a','b', 'c') default 'a',
-f31 FLOAT,
-f32 NUMERIC(17,9),
-f33 SET ('a', 'b', 'c') default 'b',
-f34 VARBINARY(1025),
-f35 VARCHAR(257)       
-) ENGINE='MyISAM';
-
-** Alter tables on slave and drop columns **
-
-alter table t2 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11, drop
-f12;
-alter table t3 drop f5, drop f6, drop f8, drop f10, drop f11, drop f12;
-alter table t4 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
-alter table t31 
-drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11,
-drop f12, drop f13, drop f14, drop f15, drop f16, drop f17, drop f18,
-drop f19, drop f20, drop f21, drop f22, drop f23, drop f24, drop f25,
-drop f26, drop f27, drop f28, drop f29, drop f30, drop f31, drop f32,
-drop f33, drop f34, drop f35;
-
-** Insert Data into Master **
-INSERT into t2 set f1=1, f2=1, f3=1, f4='first', f8='f8: medium size blob', f10='f10:
-some var char';
-INSERT into t2 values (2, 2, 2, 'second',
-2.0, 'b', 2000.0002, 'f8: medium size blob', 2000, 'f10: some var char',
-'01234567', 'c'),
-(3, 3, 3, 'third',
-3.0, 'b', 3000.0003, 'f8: medium size blob', 3000, 'f10: some var char',
-'01234567', 'c');
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-Warning	1264	Out of range value for column 'f9' at row 2
-INSERT into t3 set f1=1, f2=1, f3=1, f4='first', f10='f10: some var char';
-INSERT into t4 set f1=1, f2=1, f3=1, f4='first', f7='f7: medium size blob', f10='f10:
-binary data';
-INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
-INSERT into t31 set f1=1, f2=1, f3=2, f4='second',
-f9=2.2,  f10='seven samurai', f28=222.222, f35='222';
-Warnings:
-Warning	1366	Incorrect integer value: 'seven samurai' for column 'f10' at row 1
-INSERT into t31 values (1, 1, 3, 'third',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011', 
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-      );
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-INSERT into t31 values (1, 1, 4, 'fourth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 5, 'fifth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 6, 'sixth',
-/* f5  BIGINT,  */            NULL,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         NULL
-);
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-Warning	1264	Out of range value for column 'f5' at row 2
-Warning	1264	Out of range value for column 'f24' at row 2
-Warning	1264	Out of range value for column 'f24' at row 3
-
-** Sync slave with master ** 
-** Do selects from tables **
-
-select * from t1 order by f3;
-f1	f2	f3	f4
-2	2	2	second
-3	3	3	next
-5	5	5	second
-6	6	6	next
-8	8	8	second
-9	9	9	next
-11	11	11	second
-12	12	12	next
-14	14	14	second
-15	15	15	next
-17	17	17	second
-18	18	18	next
-20	20	20	second
-21	21	21	next
-23	23	23	second
-24	24	24	next
-26	26	26	second
-27	27	27	next
-29	29	29	second
-30	30	30	next
-31	31	31	second
-32	32	32	second
-33	33	33	second
-34	34	34	second
-35	35	35	second
-36	36	36	second
-37	37	37	second
-38	38	38	second
-39	39	39	second
-40	40	40	second
-41	41	41	second
-42	42	42	second
-43	43	43	second
-44	44	44	second
-45	45	45	second
-46	46	46	second
-47	47	47	second
-48	48	48	second
-49	49	49	second
-50	50	50	second
-select * from t2 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-2	2	2	second
-3	3	3	third
-select * from t3 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t4 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t31 order by f3;
-f1	f2	f3	f4
-1	1	1	first
-1	1	2	second
-1	1	3	third
-1	1	4	fourth
-1	1	5	fifth
-1	1	6	sixth
-
-** Do updates master **
-
-update t31 set f5=555555555555555 where f3=6;
-update t31 set f2=2 where f3=2;
-update t31 set f1=NULL where f3=1;
-update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
-Warnings:
-Warning	1048	Column 'f3' cannot be null
-
-** Delete from Master **
-
-delete from t1;
-delete from t2;
-delete from t3;
-delete from t4;
-delete from t31;
-select * from t31;
-f1	f2	f3	f4
-
-** Check slave status **
-
-Checking that both slave threads are running.
-
-****************************************
-* columns in master at middle of table *
-* Expect: Proper error message         *
-****************************************
-
-** Stop and Reset Slave **
-
-STOP SLAVE;
-RESET SLAVE;
-
-** create table slave side **
-CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
-) ENGINE='MyISAM';
-
-** Connect to master and create table **
-
-CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233',
-c CHAR(5), e INT DEFAULT '1')ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t10 () VALUES(1,@b1,DEFAULT,'Kyle',DEFAULT),
-(2,@b1,DEFAULT,'JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1535 ***
-********************************************
-
---source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
-include/start_slave.inc
-
-*** Drop t10  ***
-DROP TABLE t10;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: Proper error message              *
-*********************************************
-
-*** Create t11 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
-) ENGINE='MyISAM';
-
-*** Create t11 on Master ***
-CREATE TABLE t11 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT),
-(2,@b1,'Testing is cool','JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1535 ***
-********************************************
-
---source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
-include/start_slave.inc
-
-*** Drop t11  ***
-DROP TABLE t11;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: This one should pass blob-text    *
-*********************************************
-
-*** Create t12 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
-) ENGINE='MyISAM';
-
-*** Create t12 on Master ***
-CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t12 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',DEFAULT,DEFAULT),
-(3,@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT a,hex(b),f,c,e FROM t12 ORDER BY a;
-a	hex(b)	f	c	e
-1	62316231623162316231623162316231	Kyle	test	1
-2	62316231623162316231623162316231	JOE	test	1
-3	62316231623162316231623162316231	QA	test	1
-
-*** Select on Slave ***
-SELECT a,hex(b),c FROM t12 ORDER BY a;
-a	hex(b)	c
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-*** Drop t12  ***
-DROP TABLE t12;
-
-****************************************************
-* - Alter Master adding columns at middle of table *
-*   Expect: columns added                          *
-****************************************************
-
-
-*** Create t14 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t14 on Master ***
-CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t14 ADD COLUMN c2 DECIMAL(8,2) AFTER c1;
-ALTER TABLE t14 ADD COLUMN c3 TEXT AFTER c2;
-
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t14 () VALUES(1,1.00,'Replication Testing Extra Col',@b1,'Kyle',DEFAULT,DEFAULT),
-(2,2.00,'This Test Should work',@b1,'JOE',DEFAULT,DEFAULT),
-(3,3.00,'If is does not, I will open a bug',@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT c1,c2,c3,hex(c4),c5,c6,c7 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5	c6	c7
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP
-
-*** Select on Slave ****
-SELECT c1,c2,c3,hex(c4),c5 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA
-
-****************************************************
-* - Alter Master Dropping columns from the middle. *
-*   Expect: columns dropped                        *
-****************************************************
-
-*** connect to master and drop columns ***
-ALTER TABLE t14 DROP COLUMN c2;
-ALTER TABLE t14 DROP COLUMN c7;
-
-*** Select from Master ***
-SELECT c1,c3,hex(c4),c5,c6 FROM t14 ORDER BY c1;
-c1	c3	hex(c4)	c5	c6
-1	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1
-2	This Test Should work	62316231623162316231623162316231	JOE	1
-3	If is does not, I will open a bug	62316231623162316231623162316231	QA	1
-
-************
-* Bug30415 *
-************
-Last_SQL_Error = Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t14  ***
-DROP TABLE t14;
-DROP TABLE t14;
-RESET MASTER;
-START SLAVE;
-
-*************************************************
-* - Alter Master adding columns at end of table *
-*   Expect: Error 1054                          *
-*************************************************
-
-*** Create t15 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t15 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t15 on Master ***
-CREATE TABLE t15 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7;
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t15 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT,3.00),
-(2,@b1,'JOE',DEFAULT,DEFAULT,3.00),
-(3,@b1,'QA',DEFAULT,DEFAULT,3.00);
-SELECT c1,hex(c4),c5,c6,c7,c2 FROM t15 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7	c2
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP	3.00
-2	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP	3.00
-3	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP	3.00
-
-********************************************
-*** Expect slave to fail with Error 1054 ***
-********************************************
-
-Last_SQL_Error = Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t15  ***
-DROP TABLE t15;
-DROP TABLE t15;
-RESET MASTER;
-START SLAVE;
-
-************************************************
-* - Create index on Master column not on slave *
-*   Expect:Warning                             *
-************************************************
-
-*** Create t16 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t16 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t16 on Master ***
-CREATE TABLE t16 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Create Index and Data Insert ***
-CREATE INDEX part_of_c6 ON t16 (c6);
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t16 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t16 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-*****************
-*** BUG 30434 ***
-*****************
-
-Last_SQL_Error = Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t16  ***
-DROP TABLE t16;
-DROP TABLE t16;
-RESET MASTER;
-START SLAVE;
-
-*****************************************************
-* - Delete rows using column on Master not on slave *
-*   Expect: Rows Deleted                            *
-*****************************************************
-
-*** Create t17 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t17 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t17 on Master ***
-CREATE TABLE t17 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t17 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-** Delete from master **
-DELETE FROM t17 WHERE c6 = 3;
-SELECT c1,hex(c4),c5,c6,c7 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-
-** Check slave **
-SELECT c1,hex(c4),c5 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-DROP TABLE t17;
-
-
-*****************************************************
-* - Update row using column on Master not on slave *
-*   Expect: Rows updated                           *
-*****************************************************
-
-** Bug30674 **
-
-*** Create t18 on slave  ***
-
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t18 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t18 on Master ***
-CREATE TABLE t18 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t18 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-** update from master **
-UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
-SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
-
-** Check slave **
-SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	TEST
-DROP TABLE t18;
-
-
-*****************************************************
-* - Insert UUID  column on Master not on slave *
-*   Expect: Rows inserted                      *
-*****************************************************
-
-*** Create t5 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t5 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t5 on Master ***
-CREATE TABLE t5 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 LONG, 
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-INSERT INTO t5 () VALUES(1,@b1,'Kyle',UUID(),DEFAULT),
-(2,@b1,'JOE',UUID(),DEFAULT),
-(3,@b1,'QA',UUID(),DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t5 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	6231623162316231	Kyle	UUID	TIME
-2	6231623162316231	JOE	UUID	TIME
-3	6231623162316231	QA	UUID	TIME
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t5 ORDER BY c1;
-c1	hex(c4)	c5
-1	6231623162316231	Kyle
-2	6231623162316231	JOE
-3	6231623162316231	QA
-DROP TABLE t5;
-
-set binlog_format=statement;
-
-***********************************************************
-***********************************************************
-***************** Start of Testing ************************
-***********************************************************
-***********************************************************
-* This test format == binlog_format	STATEMENT and engine == 'MyISAM'
-***********************************************************
-***********************************************************
-
-***** Testing more columns on the Master *****
-
-CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 FLOAT DEFAULT '2.00', 
-f6 CHAR(4) DEFAULT 'TEST',
-f7 INT DEFAULT '0',
-f8 TEXT,
-f9 LONGBLOB,
-f10 BIT(63),
-f11 VARBINARY(64))ENGINE='MyISAM';
-
-* Alter Table on Slave and drop columns f5 through f11 *
-
-alter table t1 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
-
-* Insert data in Master then update and delete some rows*
-
-* Select count and 20 rows from Master *
-
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-40
-
-SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9,
-hex(f10),hex(f11) FROM t1 ORDER BY f3 LIMIT 20;
-f1	f2	f3	f4	f5	f6	f7	f8	f9	hex(f10)	hex(f11)
-2	2	2	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-3	3	3	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-5	5	5	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-6	6	6	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-8	8	8	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-9	9	9	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-11	11	11	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-12	12	12	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-14	14	14	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-15	15	15	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-17	17	17	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-18	18	18	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-20	20	20	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-21	21	21	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-23	23	23	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-24	24	24	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-26	26	26	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-27	27	27	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-29	29	29	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-30	30	30	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-
-* Select count and 20 rows from Slave *
-
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-40
-
-SELECT * FROM t1 ORDER BY f3 LIMIT 20;
-f1	f2	f3	f4
-2	2	2	second
-3	3	3	next
-5	5	5	second
-6	6	6	next
-8	8	8	second
-9	9	9	next
-11	11	11	second
-12	12	12	next
-14	14	14	second
-15	15	15	next
-17	17	17	second
-18	18	18	next
-20	20	20	second
-21	21	21	next
-23	23	23	second
-24	24	24	next
-26	26	26	second
-27	27	27	next
-29	29	29	second
-30	30	30	next
-Checking that both slave threads are running.
-
-***** Testing Altering table def scenario *****
-
-CREATE TABLE t2 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f7 DECIMAL(17,9) default '1000.00',
-f8 MEDIUMBLOB,
-f9 NUMERIC(6,4) default '2000.00',
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='MyISAM';
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-
-CREATE TABLE t3 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 ENUM('a', 'b', 'c') default 'a',
-f8 MEDIUMBLOB,
-f10 VARCHAR(1024),
-f11 BINARY(20) NOT NULL DEFAULT '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f12 SET('a', 'b', 'c') default 'b')
-ENGINE='MyISAM';
-
-CREATE TABLE t4 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 DOUBLE DEFAULT '2.00', 
-f6 DECIMAL(17,9) default '1000.00',
-f7 MEDIUMBLOB,
-f8 NUMERIC(6,4) default '2000.00',
-f9 VARCHAR(1024),
-f10 BINARY(20) not null default '\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0',
-f11 CHAR(255))
-ENGINE='MyISAM';
-Warnings:
-Warning	1264	Out of range value for column 'f8' at row 1
-
-CREATE TABLE t31 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5  BIGINT,
-f6  BLOB,
-f7  DATE,
-f8  DATETIME,
-f9  FLOAT,
-f10 INT,
-f11 LONGBLOB,
-f12 LONGTEXT,
-f13 MEDIUMBLOB,
-f14 MEDIUMINT,
-f15 MEDIUMTEXT,
-f16 REAL,
-f17 SMALLINT,
-f18 TEXT,
-f19 TIME,
-f20 TIMESTAMP,
-f21 TINYBLOB,
-f22 TINYINT,
-f23 TINYTEXT,
-f24 YEAR,
-f25 BINARY(255),
-f26 BIT(64),
-f27 CHAR(255),
-f28 DECIMAL(30,7),
-f29 DOUBLE,
-f30 ENUM ('a','b', 'c') default 'a',
-f31 FLOAT,
-f32 NUMERIC(17,9),
-f33 SET ('a', 'b', 'c') default 'b',
-f34 VARBINARY(1025),
-f35 VARCHAR(257)       
-) ENGINE='MyISAM';
-
-** Alter tables on slave and drop columns **
-
-alter table t2 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11, drop
-f12;
-alter table t3 drop f5, drop f6, drop f8, drop f10, drop f11, drop f12;
-alter table t4 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
-alter table t31 
-drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11,
-drop f12, drop f13, drop f14, drop f15, drop f16, drop f17, drop f18,
-drop f19, drop f20, drop f21, drop f22, drop f23, drop f24, drop f25,
-drop f26, drop f27, drop f28, drop f29, drop f30, drop f31, drop f32,
-drop f33, drop f34, drop f35;
-
-** Insert Data into Master **
-INSERT into t2 set f1=1, f2=1, f3=1, f4='first', f8='f8: medium size blob', f10='f10:
-some var char';
-INSERT into t2 values (2, 2, 2, 'second',
-2.0, 'b', 2000.0002, 'f8: medium size blob', 2000, 'f10: some var char',
-'01234567', 'c'),
-(3, 3, 3, 'third',
-3.0, 'b', 3000.0003, 'f8: medium size blob', 3000, 'f10: some var char',
-'01234567', 'c');
-Warnings:
-Warning	1264	Out of range value for column 'f9' at row 1
-Warning	1264	Out of range value for column 'f9' at row 2
-INSERT into t3 set f1=1, f2=1, f3=1, f4='first', f10='f10: some var char';
-INSERT into t4 set f1=1, f2=1, f3=1, f4='first', f7='f7: medium size blob', f10='f10:
-binary data';
-INSERT into t31 set f1=1, f2=1, f3=1, f4='first';
-INSERT into t31 set f1=1, f2=1, f3=2, f4='second',
-f9=2.2,  f10='seven samurai', f28=222.222, f35='222';
-Warnings:
-Warning	1366	Incorrect integer value: 'seven samurai' for column 'f10' at row 1
-INSERT into t31 values (1, 1, 3, 'third',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011', 
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-      );
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-INSERT into t31 values (1, 1, 4, 'fourth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 5, 'fifth',
-/* f5  BIGINT,  */            333333333333333333333333,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         'three times three'
-       ),
-(1, 1, 6, 'sixth',
-/* f5  BIGINT,  */            NULL,
-/* f6  BLOB,  */              '3333333333333333333333',
-/* f7  DATE,  */              '2007-07-18',
-/* f8  DATETIME,  */          "2007-07-18",
-/* f9  FLOAT,  */             3.33333333,
-/* f10 INT,  */               333333333,
-/* f11 LONGBLOB,  */          '3333333333333333333',
-/* f12 LONGTEXT,  */          '3333333333333333333',
-/* f13 MEDIUMBLOB,  */        '3333333333333333333',
-/* f14 MEDIUMINT,  */         33,
-/* f15 MEDIUMTEXT,  */        3.3,
-/* f16 REAL,  */              3.3,
-/* f17 SMALLINT,  */          3,
-/* f18 TEXT,  */              '33',
-/* f19 TIME,  */              '2:59:58.999',
-/* f20 TIMESTAMP,  */         20000303000000,
-/* f21 TINYBLOB,  */          '3333',
-/* f22 TINYINT,  */           3,
-/* f23 TINYTEXT,  */          '3',
-/* f24 YEAR,  */              3000,
-/* f25 BINARY(255),  */       'three_33333',
-/* f26 BIT(64),  */           b'011',
-/* f27 CHAR(255),  */         'three',
-/* f28 DECIMAL(30,7),  */     3.333,
-/* f29 DOUBLE,  */            3.333333333333333333333333333,
-/* f30 ENUM ('a','b','c')*/   'c',
-/* f31 FLOAT,  */             3.0,
-/* f32 NUMERIC(17,9),  */     3.3333,
-/* f33 SET ('a','b','c'),*/   'c',
-/*f34 VARBINARY(1025),*/      '3333 minus 3',
-/*f35 VARCHAR(257),*/         NULL
-);
-Warnings:
-Warning	1264	Out of range value for column 'f5' at row 1
-Warning	1264	Out of range value for column 'f24' at row 1
-Warning	1264	Out of range value for column 'f5' at row 2
-Warning	1264	Out of range value for column 'f24' at row 2
-Warning	1264	Out of range value for column 'f24' at row 3
-
-** Sync slave with master ** 
-** Do selects from tables **
-
-select * from t1 order by f3;
-f1	f2	f3	f4
-2	2	2	second
-3	3	3	next
-5	5	5	second
-6	6	6	next
-8	8	8	second
-9	9	9	next
-11	11	11	second
-12	12	12	next
-14	14	14	second
-15	15	15	next
-17	17	17	second
-18	18	18	next
-20	20	20	second
-21	21	21	next
-23	23	23	second
-24	24	24	next
-26	26	26	second
-27	27	27	next
-29	29	29	second
-30	30	30	next
-31	31	31	second
-32	32	32	second
-33	33	33	second
-34	34	34	second
-35	35	35	second
-36	36	36	second
-37	37	37	second
-38	38	38	second
-39	39	39	second
-40	40	40	second
-41	41	41	second
-42	42	42	second
-43	43	43	second
-44	44	44	second
-45	45	45	second
-46	46	46	second
-47	47	47	second
-48	48	48	second
-49	49	49	second
-50	50	50	second
-select * from t2 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-2	2	2	second
-3	3	3	third
-select * from t3 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t4 order by f1;
-f1	f2	f3	f4
-1	1	1	first
-select * from t31 order by f3;
-f1	f2	f3	f4
-1	1	1	first
-1	1	2	second
-1	1	3	third
-1	1	4	fourth
-1	1	5	fifth
-1	1	6	sixth
-
-** Do updates master **
-
-update t31 set f5=555555555555555 where f3=6;
-update t31 set f2=2 where f3=2;
-update t31 set f1=NULL where f3=1;
-update t31 set f3=NULL, f27=NULL, f35='f35 new value' where f3=3;
-Warnings:
-Warning	1048	Column 'f3' cannot be null
-
-** Delete from Master **
-
-delete from t1;
-delete from t2;
-delete from t3;
-delete from t4;
-delete from t31;
-select * from t31;
-f1	f2	f3	f4
-
-** Check slave status **
-
-Checking that both slave threads are running.
-
-****************************************
-* columns in master at middle of table *
-* Expect: Proper error message         *
-****************************************
-
-** Stop and Reset Slave **
-
-STOP SLAVE;
-RESET SLAVE;
-
-** create table slave side **
-CREATE TABLE t10 (a INT PRIMARY KEY, b BLOB, c CHAR(5)
-) ENGINE='MyISAM';
-
-** Connect to master and create table **
-
-CREATE TABLE t10 (a INT KEY, b BLOB, f DOUBLE DEFAULT '233',
-c CHAR(5), e INT DEFAULT '1')ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t10 () VALUES(1,@b1,DEFAULT,'Kyle',DEFAULT),
-(2,@b1,DEFAULT,'JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1535 ***
-********************************************
-
---source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
-include/start_slave.inc
-
-*** Drop t10  ***
-DROP TABLE t10;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: Proper error message              *
-*********************************************
-
-*** Create t11 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t11 (a INT PRIMARY KEY, b BLOB, c VARCHAR(254)
-) ENGINE='MyISAM';
-
-*** Create t11 on Master ***
-CREATE TABLE t11 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT),
-(2,@b1,'Testing is cool','JOE',DEFAULT),
-(3,@b1,DEFAULT,'QA',DEFAULT);
-
-********************************************
-*** Expect slave to fail with Error 1535 ***
-********************************************
-
---source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
-include/start_slave.inc
-
-*** Drop t11  ***
-DROP TABLE t11;
-
-*********************************************
-* More columns in master at middle of table *
-* Expect: This one should pass blob-text    *
-*********************************************
-
-*** Create t12 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t12 (a INT PRIMARY KEY, b BLOB, c BLOB
-) ENGINE='MyISAM';
-
-*** Create t12 on Master ***
-CREATE TABLE t12 (a INT KEY, b BLOB, f TEXT,
-c CHAR(5) DEFAULT 'test', e INT DEFAULT '1')ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t12 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',DEFAULT,DEFAULT),
-(3,@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT a,hex(b),f,c,e FROM t12 ORDER BY a;
-a	hex(b)	f	c	e
-1	62316231623162316231623162316231	Kyle	test	1
-2	62316231623162316231623162316231	JOE	test	1
-3	62316231623162316231623162316231	QA	test	1
-
-*** Select on Slave ***
-SELECT a,hex(b),c FROM t12 ORDER BY a;
-a	hex(b)	c
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-*** Drop t12  ***
-DROP TABLE t12;
-
-****************************************************
-* - Alter Master adding columns at middle of table *
-*   Expect: columns added                          *
-****************************************************
-
-
-*** Create t14 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t14 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t14 on Master ***
-CREATE TABLE t14 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t14 ADD COLUMN c2 DECIMAL(8,2) AFTER c1;
-ALTER TABLE t14 ADD COLUMN c3 TEXT AFTER c2;
-
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t14 () VALUES(1,1.00,'Replication Testing Extra Col',@b1,'Kyle',DEFAULT,DEFAULT),
-(2,2.00,'This Test Should work',@b1,'JOE',DEFAULT,DEFAULT),
-(3,3.00,'If is does not, I will open a bug',@b1,'QA',DEFAULT,DEFAULT);
-
-SELECT c1,c2,c3,hex(c4),c5,c6,c7 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5	c6	c7
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP
-
-*** Select on Slave ****
-SELECT c1,c2,c3,hex(c4),c5 FROM t14 ORDER BY c1;
-c1	c2	c3	hex(c4)	c5
-1	1.00	Replication Testing Extra Col	62316231623162316231623162316231	Kyle
-2	2.00	This Test Should work	62316231623162316231623162316231	JOE
-3	3.00	If is does not, I will open a bug	62316231623162316231623162316231	QA
-
-****************************************************
-* - Alter Master Dropping columns from the middle. *
-*   Expect: columns dropped                        *
-****************************************************
-
-*** connect to master and drop columns ***
-ALTER TABLE t14 DROP COLUMN c2;
-ALTER TABLE t14 DROP COLUMN c7;
-
-*** Select from Master ***
-SELECT c1,c3,hex(c4),c5,c6 FROM t14 ORDER BY c1;
-c1	c3	hex(c4)	c5	c6
-1	Replication Testing Extra Col	62316231623162316231623162316231	Kyle	1
-2	This Test Should work	62316231623162316231623162316231	JOE	1
-3	If is does not, I will open a bug	62316231623162316231623162316231	QA	1
-
-************
-* Bug30415 *
-************
-Last_SQL_Error = Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t14  ***
-DROP TABLE t14;
-DROP TABLE t14;
-RESET MASTER;
-START SLAVE;
-
-*************************************************
-* - Alter Master adding columns at end of table *
-*   Expect: Error 1054                          *
-*************************************************
-
-*** Create t15 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t15 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t15 on Master ***
-CREATE TABLE t15 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7;
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t15 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT,3.00),
-(2,@b1,'JOE',DEFAULT,DEFAULT,3.00),
-(3,@b1,'QA',DEFAULT,DEFAULT,3.00);
-SELECT c1,hex(c4),c5,c6,c7,c2 FROM t15 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7	c2
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP	3.00
-2	62316231623162316231623162316231	JOE	1	CURRENT_TIMESTAMP	3.00
-3	62316231623162316231623162316231	QA	1	CURRENT_TIMESTAMP	3.00
-
-********************************************
-*** Expect slave to fail with Error 1054 ***
-********************************************
-
-Last_SQL_Error = Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t15  ***
-DROP TABLE t15;
-DROP TABLE t15;
-RESET MASTER;
-START SLAVE;
-
-************************************************
-* - Create index on Master column not on slave *
-*   Expect:Warning                             *
-************************************************
-
-*** Create t16 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t16 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t16 on Master ***
-CREATE TABLE t16 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Create Index and Data Insert ***
-CREATE INDEX part_of_c6 ON t16 (c6);
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t16 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t16 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-*****************
-*** BUG 30434 ***
-*****************
-
-Last_SQL_Error = Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
-STOP SLAVE;
-RESET SLAVE;
-
-*** Drop t16  ***
-DROP TABLE t16;
-DROP TABLE t16;
-RESET MASTER;
-START SLAVE;
-
-*****************************************************
-* - Delete rows using column on Master not on slave *
-*   Expect: Rows Deleted                            *
-*****************************************************
-
-*** Create t17 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t17 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t17 on Master ***
-CREATE TABLE t17 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t17 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-** Delete from master **
-DELETE FROM t17 WHERE c6 = 3;
-SELECT c1,hex(c4),c5,c6,c7 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-
-** Check slave **
-SELECT c1,hex(c4),c5 FROM t17 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-DROP TABLE t17;
-
-
-*****************************************************
-* - Update row using column on Master not on slave *
-*   Expect: Rows updated                           *
-*****************************************************
-
-** Bug30674 **
-
-*** Create t18 on slave  ***
-
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t18 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t18 on Master ***
-CREATE TABLE t18 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 INT DEFAULT '1',
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-set @b1 = concat(@b1,@b1);
-INSERT INTO t18 () VALUES(1,@b1,'Kyle',DEFAULT,DEFAULT),
-(2,@b1,'JOE',2,DEFAULT),
-(3,@b1,'QA',3,DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	QA	3	CURRENT_TIMESTAMP
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	QA
-
-** update from master **
-UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
-SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	62316231623162316231623162316231	Kyle	1	CURRENT_TIMESTAMP
-2	62316231623162316231623162316231	JOE	2	CURRENT_TIMESTAMP
-3	62316231623162316231623162316231	TEST	3	CURRENT_TIMESTAMP
-
-** Check slave **
-SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
-c1	hex(c4)	c5
-1	62316231623162316231623162316231	Kyle
-2	62316231623162316231623162316231	JOE
-3	62316231623162316231623162316231	TEST
-DROP TABLE t18;
-
-
-*****************************************************
-* - Insert UUID  column on Master not on slave *
-*   Expect: Rows inserted                      *
-*****************************************************
-
-*** Create t5 on slave  ***
-STOP SLAVE;
-RESET SLAVE;
-CREATE TABLE t5 (c1 INT PRIMARY KEY, c4 BLOB, c5 CHAR(5)
-) ENGINE='MyISAM';
-
-*** Create t5 on Master ***
-CREATE TABLE t5 (c1 INT KEY, c4 BLOB, c5 CHAR(5),
-c6 LONG, 
-c7 TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP
-)ENGINE='MyISAM';
-RESET MASTER;
-
-*** Start Slave ***
-START SLAVE;
-
-*** Master Data Insert ***
-set @b1 = 'b1b1b1b1';
-INSERT INTO t5 () VALUES(1,@b1,'Kyle',UUID(),DEFAULT),
-(2,@b1,'JOE',UUID(),DEFAULT),
-(3,@b1,'QA',UUID(),DEFAULT);
-SELECT c1,hex(c4),c5,c6,c7 FROM t5 ORDER BY c1;
-c1	hex(c4)	c5	c6	c7
-1	6231623162316231	Kyle	UUID	TIME
-2	6231623162316231	JOE	UUID	TIME
-3	6231623162316231	QA	UUID	TIME
-
-** Select * from Slave **
-SELECT c1,hex(c4),c5 FROM t5 ORDER BY c1;
-c1	hex(c4)	c5
-1	6231623162316231	Kyle
-2	6231623162316231	JOE
-3	6231623162316231	QA
-DROP TABLE t5;
-
-set binlog_format=mixed;
-
-***********************************************************
-***********************************************************
-***************** Start of Testing ************************
-***********************************************************
-***********************************************************
-* This test format == binlog_format	MIXED and engine == 'MyISAM'
-***********************************************************
-***********************************************************
-
-***** Testing more columns on the Master *****
-
-CREATE TABLE t1 (f1 INT, f2 INT, f3 INT PRIMARY KEY, f4 CHAR(20),
-/* extra */
-f5 FLOAT DEFAULT '2.00', 
-f6 CHAR(4) DEFAULT 'TEST',
-f7 INT DEFAULT '0',
-f8 TEXT,
-f9 LONGBLOB,
-f10 BIT(63),
-f11 VARBINARY(64))ENGINE='MyISAM';
-
-* Alter Table on Slave and drop columns f5 through f11 *
-
-alter table t1 drop f5, drop f6, drop f7, drop f8, drop f9, drop f10, drop f11;
-
-* Insert data in Master then update and delete some rows*
-
-* Select count and 20 rows from Master *
-
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-40
-
-SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9,
-hex(f10),hex(f11) FROM t1 ORDER BY f3 LIMIT 20;
-f1	f2	f3	f4	f5	f6	f7	f8	f9	hex(f10)	hex(f11)
-2	2	2	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-3	3	3	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-5	5	5	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-6	6	6	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-8	8	8	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-9	9	9	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-11	11	11	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-12	12	12	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-14	14	14	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-15	15	15	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-17	17	17	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-18	18	18	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-20	20	20	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-21	21	21	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-23	23	23	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-24	24	24	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-26	26	26	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-27	27	27	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-29	29	29	second	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-30	30	30	next	2	kaks	2	got stolen from the paradise	very fat blob	1555	123456
-
-* Select count and 20 rows from Slave *
-
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-40
-
-SELECT * FROM t1 ORDER BY f3 LIMIT 20;
-f1	f2	f3	f4
-2	2	2	second
-3	3	3	next
-5	5	5	second
-6	6	6	next
-8	8	8	second
-9	9	9	next
-11	11	11	second
-12	12	12	next
-14	14	14	second
-15	15	15	next
-17	17	17	second
-18	18	18	next
-20	20	20	second
-21	21	21	next
-23	23	23	second
-24	24	24	next
-26	26	26	second
-27	27	27	next
-29	29	29	second
-30	30	30	next
 Checking that both slave threads are running.
 
 ***** Testing Altering table def scenario *****
@@ -3112,11 +460,11 @@ INSERT INTO t10 () VALUES(1,@b1,DEFAULT,
 (3,@b1,DEFAULT,'QA',DEFAULT);
 
 ********************************************
-*** Expect slave to fail with Error 1535 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
 
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
 
@@ -3150,11 +498,11 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing
 (3,@b1,DEFAULT,'QA',DEFAULT);
 
 ********************************************
-*** Expect slave to fail with Error 1535 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
 
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
 
@@ -3364,7 +712,6 @@ c1	hex(c4)	c5	c6	c7
 *****************
 
 Last_SQL_Error = Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
->>>>>>> MERGE-SOURCE
 STOP SLAVE;
 RESET SLAVE;
 

=== modified file 'mysql-test/suite/rpl/r/rpl_flushlog_loop.result'
--- a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result	2010-06-18 11:10:53 +0000
@@ -23,50 +23,6 @@ include/start_slave.inc
 CREATE TABLE t1 (a INT KEY) ENGINE= MyISAM;
 INSERT INTO t1 VALUE(1);
 FLUSH LOGS;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	SLAVE_PORT
-Connect_Retry	60
-Master_Log_File	slave-bin.000001
-Read_Master_Log_Pos	POSITION
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	slave-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	POSITION
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	#
-Last_IO_Errno	#
-Last_IO_Error	
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	2
-=======
 INSERT INTO t1 VALUE(2);
 Checking that both slave threads are running.
 Relay_Log_File	relay-log.000003
->>>>>>> MERGE-SOURCE

=== modified file 'mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result'
--- a/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2010-05-24 13:54:08 +0000
+++ b/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result	2010-06-18 11:10:53 +0000
@@ -14,7 +14,6 @@ slave is going to hang in get_master_ver
 slave is unblocked
 SET DEBUG_SYNC='now SIGNAL signal.get_unix_timestamp';
 Check network error happened here
-NETWORK ERROR
 set @@global.debug = "-d,'debug_lock.before_get_UNIX_TIMESTAMP'";
 stop slave;
 SET @@global.debug= "+d,'debug_lock.before_get_SERVER_ID'";
@@ -23,7 +22,6 @@ slave is going to hang in get_master_ver
 slave is unblocked
 SET DEBUG_SYNC='now SIGNAL signal.get_server_id';
 Check network error happened here
-NETWORK ERROR
 set @@global.debug = "-d,'debug_lock.before_get_SERVER_ID'";
 set global debug= '';
 reset master;

=== modified file 'mysql-test/suite/rpl/r/rpl_grant.result'
--- a/mysql-test/suite/rpl/r/rpl_grant.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_grant.result	2010-06-18 11:10:53 +0000
@@ -41,47 +41,3 @@ user	host
 SELECT COUNT(*) FROM mysql.user WHERE user like 'dummy%';
 COUNT(*)
 0
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE

=== modified file 'mysql-test/suite/rpl/r/rpl_heartbeat.result'
--- a/mysql-test/suite/rpl/r/rpl_heartbeat.result	2009-11-04 12:28:20 +0000
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2010-06-18 11:10:53 +0000
@@ -52,88 +52,6 @@ Variable_name	Slave_heartbeat_period
 Value	0.500
 start slave;
 create table t1 (f1 int);
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	60
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	280
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	280
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	60
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	280
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	280
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
 Value	0.500

=== modified file 'mysql-test/suite/rpl/r/rpl_incident.result'
--- a/mysql-test/suite/rpl/r/rpl_incident.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_incident.result	2010-06-18 11:10:53 +0000
@@ -26,50 +26,6 @@ a
 1
 2
 3
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	#
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1590
-Last_Error	The incident LOST_EVENTS occured on the master. Message: <none>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1590
-Last_SQL_Error	The incident LOST_EVENTS occured on the master. Message: <none>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 START SLAVE;
 SELECT * FROM t1;
@@ -78,49 +34,5 @@ a
 2
 3
 4
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	#
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000002
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result'
--- a/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result	2010-06-18 11:10:53 +0000
@@ -832,199 +832,6 @@ DELETE FROM t2;
 ******************** SHOW BINLOG EVENTS ********************
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	#	Format_desc	1	#	Server ver: #
-master-bin.000001	#	Query	1	#	CREATE DATABASE test_rpl
-master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE TABLE t1 (a int auto_increment not null, b char(254), PRIMARY KEY(a)) ENGINE=innodb
-master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE TABLE t2 (a int auto_increment not null, b char(254), PRIMARY KEY(a)) ENGINE=innodb
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 't1, text 1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(2, 't1, text 2')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t2 VALUES(1, 't2, text 1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1 WHERE a = 1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test_rpl.t2)
-master-bin.000001	#	Delete_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 't1, text 1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test_rpl.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t2 SELECT * FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t2 VALUES (1, 't1, text 1') ON DUPLICATE KEY UPDATE b = 't2, text 1'
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1 WHERE a = 2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2 WHERE a = 2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Begin_load_query	1	#	;file_id=#;block_len=#
-master-bin.000001	#	Execute_load_query	1	#	use `test_rpl`; LOAD DATA INFILE 'MYSQLTEST_VARDIR/std_data/rpl_mixed.dat' INTO TABLE `t1` FIELDS TERMINATED BY '|' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`, `b`) ;file_id=#
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 't1, text 1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(2, 't1, text 2')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(3, 't1, text 3')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; REPLACE INTO t1 VALUES(1, 't1, text 11')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test_rpl.t1)
-master-bin.000001	#	Update_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; REPLACE INTO t1 SET a=3, b='t1, text 33'
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1 WHERE a = 2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 't1, text 1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 'CCC')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(2, 'DDD')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t2 VALUES(1, 'DDD')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t2 VALUES(2, 'CCC')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 't1, text 1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t2 VALUES(1, 't2, text 1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 't1, text 1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	use `test_rpl`; TRUNCATE t1
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 't1, text 1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t2 VALUES(1, 't2, text 1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; UPDATE t1 SET b = 't1, text 1 updated' WHERE a = 1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; UPDATE t1, t2 SET t1.b = 'test', t2.b = 'test'
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES (1, 'start')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES (3, 'before savepoint s1')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES (5, 'before savepoint s2')
-master-bin.000001	#	Query	1	#	SAVEPOINT s2
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES (6, 'after savepoint s2')
-master-bin.000001	#	Table_map	1	#	table_id: # (test_rpl.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1 WHERE a = 7
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t1
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; DELETE FROM t2
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE USER 'user_test_rpl'@'localhost' IDENTIFIED BY PASSWORD '*1111111111111111111111111111111111111111'
-master-bin.000001	#	Query	1	#	use `test_rpl`; GRANT SELECT ON *.* TO 'user_test_rpl'@'localhost'
-master-bin.000001	#	Query	1	#	use `test_rpl`; REVOKE SELECT ON *.* FROM 'user_test_rpl'@'localhost'
-master-bin.000001	#	Query	1	#	use `test_rpl`; SET PASSWORD FOR 'user_test_rpl'@'localhost'='*0000000000000000000000000000000000000000'
-master-bin.000001	#	Query	1	#	use `test_rpl`; RENAME USER 'user_test_rpl'@'localhost' TO 'user_test_rpl_2'@'localhost'
-master-bin.000001	#	Query	1	#	use `test_rpl`; DROP USER 'user_test_rpl_2'@'localhost'
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test_rpl`; INSERT INTO t1 VALUES(100, 'test')
-master-bin.000001	#	Xid	1	#	#
-master-bin.000001	#	Query	1	#	use `test_rpl`; ANALYZE TABLE t1
-master-bin.000001	#	Query	1	#	use `test_rpl`; OPTIMIZE TABLE t1
-master-bin.000001	#	Query	1	#	use `test_rpl`; REPAIR TABLE t1
-master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
-=======
 master-bin.000001	#	Query	#	#	CREATE DATABASE test_rpl
 master-bin.000001	#	Query	#	#	use `test_rpl`; CREATE TABLE t1 (a int auto_increment not null, b char(254), PRIMARY KEY(a)) ENGINE=innodb
 master-bin.000001	#	Query	#	#	use `test_rpl`; CREATE TABLE t2 (a int auto_increment not null, b char(254), PRIMARY KEY(a)) ENGINE=innodb
@@ -1155,9 +962,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test_rpl`; INSERT INTO t1 VALUES(1, 't1, text 1')
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test_rpl`; TRUNCATE t1
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test_rpl`; DELETE FROM t1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -1217,7 +1022,6 @@ master-bin.000001	#	Query	#	#	use `test_
 master-bin.000001	#	Query	#	#	use `test_rpl`; OPTIMIZE TABLE t1
 master-bin.000001	#	Query	#	#	use `test_rpl`; REPAIR TABLE t1
 master-bin.000001	#	Query	#	#	use `test_rpl`; CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
->>>>>>> MERGE-SOURCE
 BEGIN
 UPDATE t1 SET b = 'test' WHERE a = 201;
 END

=== modified file 'mysql-test/suite/rpl/r/rpl_known_bugs_detection.result'
--- a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result	2010-06-18 11:10:53 +0000
@@ -11,51 +11,7 @@ SELECT * FROM t1;
 a	b
 1	10
 2	2
-<<<<<<< TREE
-show slave status;;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1105
-Last_Error	Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10'
-Skip_Counter	0
-Exec_Master_Log_Pos	247
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1105
-Last_SQL_Error	Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Last_SQL_Error = Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10'
->>>>>>> MERGE-SOURCE
 SELECT * FROM t1;
 a	b
 stop slave;
@@ -100,59 +56,11 @@ id	field_1	field_2	field_3
 4	4	d	4d
 5	5	e	5e
 6	6	f	6f
-<<<<<<< TREE
-show slave status;;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1105
-Last_Error	Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1 (field_1, field_2, field_3)
-SELECT t2.field_a, t2.field_b, t2.field_c
-FROM t2
-ON DUPLICATE KEY UPDATE
-t1.field_3 = t2.field_c'
-Skip_Counter	0
-Exec_Master_Log_Pos	1964
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
-Last_SQL_Errno	1105
-Last_SQL_Error	Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1 (field_1, field_2, field_3)
-=======
 Last_SQL_Error = Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1 (field_1, field_2, field_3)
->>>>>>> MERGE-SOURCE
 SELECT t2.field_a, t2.field_b, t2.field_c
 FROM t2
 ON DUPLICATE KEY UPDATE
 t1.field_3 = t2.field_c'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
 SELECT * FROM t1;
 id	field_1	field_2	field_3
 drop table t1, t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_loaddata_fatal.result'
--- a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result	2010-06-18 11:10:53 +0000
@@ -6,97 +6,9 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
 start slave;
 CREATE TABLE t1 (a INT, b INT);
 INSERT INTO t1 VALUES (1,10);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE t1;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1593
-Last_Error	Fatal error: Not enough memory
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1593
-Last_SQL_Error	Fatal error: Not enough memory
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Fatal error: Not enough memory
->>>>>>> MERGE-SOURCE
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 include/start_slave.inc
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result'
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result	2010-06-18 11:10:53 +0000
@@ -9,103 +9,11 @@ show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
 master-bin.000001	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
 include/stop_slave.inc
-<<<<<<< TREE
-change master to master_log_pos=75;
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 change master to master_log_pos=MASTER_LOG_POS;
 Read_Master_Log_Pos	75
->>>>>>> MERGE-SOURCE
 start slave;
-<<<<<<< TREE
-=======
-Last_IO_Error = Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master'
->>>>>>> MERGE-SOURCE
+Last_IO_Error = Got fatal error 1236 from master when reading data from binary log: 'binlog truncated in the middle of event'
 include/stop_slave.inc
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
 master-bin.000001	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>

=== modified file 'mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result'
--- a/mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result	2009-11-03 19:02:56 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result	2010-06-18 11:10:53 +0000
@@ -45,24 +45,14 @@ id	name
 USE test;
 DROP SCHEMA mysqlslap;
 use test;
-FLUSH LOGS;
-FLUSH LOGS;
 CREATE TABLE t1(a int, UNIQUE(a));
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 flush table t1;
-show binlog events in 'master-bin.000002' LIMIT 2,2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-x	x	x	x	x	BEGIN
-x	x	x	x	x	table_id: # (test.t1)
 select * from t1;
 a
 1
 On slave
-show binlog events in 'slave-bin.000002' LIMIT 2,2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-x	x	x	x	x	BEGIN
-x	x	x	x	x	table_id: # (test.t1)
 select * from t1;
 a
 1

=== modified file 'mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result'
--- a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result	2010-06-18 11:10:53 +0000
@@ -10,88 +10,23 @@ INSERT INTO t1 VALUES (1,1), (2,2);
 INSERT INTO t1 VALUES (3,UUID()), (4,UUID());
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1 (a INT, b LONG)
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
-master-bin.000001	#	Query	1	#	COMMIT
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	1	#	COMMIT
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT, b LONG)
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
->>>>>>> MERGE-SOURCE
 **** On Slave ****
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	#
-Last_IO_Errno	#
-Last_IO_Error	
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SHOW BINLOG EVENTS;
-=======
 show binlog events from <binlog_start>;
->>>>>>> MERGE-SOURCE
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1 (a INT, b LONG)
-slave-bin.000001	#	Query	1	#	BEGIN
-slave-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
-slave-bin.000001	#	Query	1	#	COMMIT
-slave-bin.000001	#	Query	1	#	BEGIN
-slave-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	1	#	COMMIT
-=======
 slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT, b LONG)
+slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1,1), (2,2)
+slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000001	#	Query	#	#	COMMIT
->>>>>>> MERGE-SOURCE
 DROP TABLE IF EXISTS t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_replicate_do.result'
--- a/mysql-test/suite/rpl/r/rpl_replicate_do.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_replicate_do.result	2010-06-18 11:10:53 +0000
@@ -27,34 +27,6 @@ select * from t11;
 ERROR 42S02: Table 'test.t11' doesn't exist
 drop table if exists t1,t2,t11;
 Replicate_Do_Table	test.t1
-<<<<<<< TREE
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 create table t1 (ts timestamp);
 set one_shot time_zone='met';
 insert into t1 values('2005-08-12 00:00:00');

=== modified file 'mysql-test/suite/rpl/r/rpl_rotate_logs.result'
--- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2010-06-18 11:10:53 +0000
@@ -16,40 +16,7 @@ create table t1 (s text);
 insert into t1 values('Could not break slave'),('Tried hard');
 Master_Log_File	master-bin.000001
 Relay_Master_Log_File	master-bin.000001
-<<<<<<< TREE
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 select * from t1;
 s
 Could not break slave
@@ -92,40 +59,7 @@ master-bin.000003	#
 insert into t2 values (65);
 Master_Log_File	master-bin.000003
 Relay_Master_Log_File	master-bin.000003
-<<<<<<< TREE
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 select * from t2;
 m
 34
@@ -154,53 +88,9 @@ master-bin.000008	#	<Binlog_Do_DB>	<Binl
 select * from t4;
 a
 testing temporary tables part 2
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	60
 Master_Log_File	master-bin.000008
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000008
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Master_Log_File	master-bin.000005
-Relay_Master_Log_File	master-bin.000005
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 lock tables t3 read;
 select count(*) from t3 where n >= 4;
 count(*)

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result	2010-06-18 11:10:53 +0000
@@ -58,20 +58,11 @@ DELETE FROM t1 WHERE a = 0;
 UPDATE t1 SET a=99 WHERE a = 0;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001	107	Query	1	193	use `test`; CREATE TABLE t1 (a INT)
-master-bin.000001	193	Query	1	261	BEGIN
-master-bin.000001	261	Table_map	1	302	table_id: # (test.t1)
-master-bin.000001	302	Write_rows	1	341	table_id: # flags: STMT_END_F
-master-bin.000001	341	Query	1	410	COMMIT
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
->>>>>>> MERGE-SOURCE
 DROP TABLE t1;
 ================ Test for BUG#17620 ================
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result	2010-06-18 11:10:53 +0000
@@ -485,14 +485,7 @@ Comparing tables master:test.t1 and slav
 INSERT INTO t2 VALUES (1, "", 1);
 INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
 Comparing tables master:test.t2 and slave:test.t2
-<<<<<<< TREE
 SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
-=======
-[expecting slave to stop]
-INSERT INTO t3 VALUES (1, "", 1);
-INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
 RESET MASTER;
 STOP SLAVE;
 RESET SLAVE;
@@ -504,12 +497,7 @@ Comparing tables master:test.t4 and slav
 [expecting slave to stop]
 INSERT INTO t5 VALUES (1, "", 1);
 INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
-<<<<<<< TREE
-Last_SQL_Error
-Column 1 of table 'test.t5' cannot be converted from type 'char(255)' to type 'char(16)'
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'char(255)' to type 'char(16)'
 RESET MASTER;
 STOP SLAVE;
 RESET SLAVE;
@@ -517,12 +505,7 @@ START SLAVE;
 [expecting slave to stop]
 INSERT INTO t6 VALUES (1, "", 1);
 INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
-<<<<<<< TREE
-Last_SQL_Error
-Column 1 of table 'test.t6' cannot be converted from type 'char(255)' to type 'char(128)'
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 1 of table 'test.t6' cannot be converted from type 'char(255)' to type 'char(128)'
 RESET MASTER;
 STOP SLAVE;
 RESET SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result	2010-06-18 11:10:53 +0000
@@ -488,14 +488,7 @@ Comparing tables master:test.t1 and slav
 INSERT INTO t2 VALUES (1, "", 1);
 INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
 Comparing tables master:test.t2 and slave:test.t2
-<<<<<<< TREE
 SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
-=======
-[expecting slave to stop]
-INSERT INTO t3 VALUES (1, "", 1);
-INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
 RESET MASTER;
 STOP SLAVE;
 RESET SLAVE;
@@ -507,12 +500,7 @@ Comparing tables master:test.t4 and slav
 [expecting slave to stop]
 INSERT INTO t5 VALUES (1, "", 1);
 INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
-<<<<<<< TREE
-Last_SQL_Error
-Column 1 of table 'test.t5' cannot be converted from type 'char(255)' to type 'char(16)'
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'char(255)' to type 'char(16)'
 RESET MASTER;
 STOP SLAVE;
 RESET SLAVE;
@@ -520,12 +508,7 @@ START SLAVE;
 [expecting slave to stop]
 INSERT INTO t6 VALUES (1, "", 1);
 INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
-<<<<<<< TREE
-Last_SQL_Error
-Column 1 of table 'test.t6' cannot be converted from type 'char(255)' to type 'char(128)'
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 1 of table 'test.t6' cannot be converted from type 'char(255)' to type 'char(128)'
 RESET MASTER;
 STOP SLAVE;
 RESET SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_colSize.result'
--- a/mysql-test/suite/rpl/r/rpl_row_colSize.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_colSize.result	2010-06-18 11:10:53 +0000
@@ -18,51 +18,7 @@ CREATE TABLE t1 (a DECIMAL(20, 10));
 RESET MASTER;
 INSERT INTO t1 VALUES (901251.90125);
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -78,51 +34,7 @@ CREATE TABLE t1 (a DECIMAL(27, 18));
 RESET MASTER;
 INSERT INTO t1 VALUES (901251.90125);
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'decimal(27,18)' to type 'decimal(27,9)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'decimal(27,18)' to type 'decimal(27,9)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 12, test.t1 on slave has size 12. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'decimal(27,18)' to type 'decimal(27,9)'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -138,51 +50,7 @@ CREATE TABLE t1 (a NUMERIC(20, 10));
 RESET MASTER;
 INSERT INTO t1 VALUES (901251.90125);
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -199,51 +67,7 @@ CREATE TABLE t1 (a FLOAT(47));
 RESET MASTER;
 INSERT INTO t1 VALUES (901251.90125);
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'double' to type 'float'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'double' to type 'float'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 5, test.t1 has type 4
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'double' to type 'float'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -260,51 +84,7 @@ CREATE TABLE t1 (a BIT(64));
 RESET MASTER;
 INSERT INTO t1 VALUES (B'10101');
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'bit(64)' to type 'bit(5)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'bit(64)' to type 'bit(5)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 8, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'bit(64)' to type 'bit(5)'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -320,51 +100,7 @@ CREATE TABLE t1 (a BIT(12));
 RESET MASTER;
 INSERT INTO t1 VALUES (B'10101');
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'bit(12)' to type 'bit(11)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'bit(12)' to type 'bit(11)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 2. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'bit(12)' to type 'bit(11)'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -381,51 +117,7 @@ CREATE TABLE t1 (a SET('1','2','3','4','
 RESET MASTER;
 INSERT INTO t1 VALUES ('4');
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'set' to type 'set('4')'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'set' to type 'set('4')'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'set' to type 'set('4')'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -442,51 +134,7 @@ CREATE TABLE t1 (a CHAR(20));
 RESET MASTER;
 INSERT INTO t1 VALUES ('This is a test.');
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'char(20)' to type 'char(10)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'char(20)' to type 'char(10)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 20, test.t1 on slave has size 11. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'char(20)' to type 'char(10)'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -534,51 +182,7 @@ CREATE TABLE t1 (a ENUM(
 RESET MASTER;
 INSERT INTO t1 VALUES ('44');
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'enum' to type 'enum('44','54')'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'enum' to type 'enum('44','54')'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'enum' to type 'enum('44','54')'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -595,51 +199,7 @@ CREATE TABLE t1 (a VARCHAR(2000));
 RESET MASTER;
 INSERT INTO t1 VALUES ('This is a test.');
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(100)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(100)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 100. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(100)'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -655,51 +215,7 @@ CREATE TABLE t1 (a VARCHAR(200));
 RESET MASTER;
 INSERT INTO t1 VALUES ('This is a test.');
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'varchar(200)' to type 'varchar(10)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'varchar(200)' to type 'varchar(10)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 200, test.t1 on slave has size 10. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'varchar(200)' to type 'varchar(10)'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -715,51 +231,7 @@ CREATE TABLE t1 (a VARCHAR(2000));
 RESET MASTER;
 INSERT INTO t1 VALUES ('This is a test.');
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(1000)'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(1000)'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 1000. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(1000)'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0
@@ -776,51 +248,7 @@ CREATE TABLE t1 (a LONGBLOB);
 RESET MASTER;
 INSERT INTO t1 VALUES ('This is a test.');
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	Column 0 of table 'test.t1' cannot be converted from type 'tinyblob' to type 'tinyblob'
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	1658
-Last_SQL_Error	Column 0 of table 'test.t1' cannot be converted from type 'tinyblob' to type 'tinyblob'
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 size mismatch - master has size 4, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 0 of table 'test.t1' cannot be converted from type 'tinyblob' to type 'tinyblob'
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 0

=== modified file 'mysql-test/suite/rpl/r/rpl_row_create_table.result'
--- a/mysql-test/suite/rpl/r/rpl_row_create_table.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result	2010-06-18 11:10:53 +0000
@@ -13,40 +13,12 @@ CREATE TABLE t1 (a INT, b INT);
 CREATE TABLE t2 (a INT, b INT) ENGINE=Merge;
 CREATE TABLE t3 (a INT, b INT) CHARSET=utf8;
 CREATE TABLE t4 (a INT, b INT) ENGINE=Merge CHARSET=utf8;
-<<<<<<< TREE
-SHOW BINLOG EVENTS FROM 107;
-Log_name	#
-Pos	107
-Event_type	Query
-Server_id	#
-End_log_pos	200
-Info	use `test`; CREATE TABLE t1 (a INT, b INT)
-Log_name	#
-Pos	200
-Event_type	Query
-Server_id	#
-End_log_pos	306
-Info	use `test`; CREATE TABLE t2 (a INT, b INT) ENGINE=Merge
-Log_name	#
-Pos	306
-Event_type	Query
-Server_id	#
-End_log_pos	412
-Info	use `test`; CREATE TABLE t3 (a INT, b INT) CHARSET=utf8
-Log_name	#
-Pos	412
-Event_type	Query
-Server_id	#
-End_log_pos	531
-Info	use `test`; CREATE TABLE t4 (a INT, b INT) ENGINE=Merge CHARSET=utf8
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT, b INT)
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t2 (a INT, b INT) ENGINE=Merge
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t3 (a INT, b INT) CHARSET=utf8
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t4 (a INT, b INT) ENGINE=Merge CHARSET=utf8
->>>>>>> MERGE-SOURCE
 **** On Master ****
 SHOW CREATE TABLE t1;
 Table	t1
@@ -146,11 +118,7 @@ RESET MASTER;
 include/start_slave.inc
 CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3;
 ERROR 23000: Duplicate entry '2' for key 'b'
-<<<<<<< TREE
-SHOW BINLOG EVENTS FROM 107;
-=======
 show binlog events from <binlog_start>;
->>>>>>> MERGE-SOURCE
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 CREATE TABLE t7 (a INT, b INT UNIQUE);
 INSERT INTO t7 SELECT a,b FROM tt3;
@@ -160,25 +128,13 @@ a	b
 1	2
 2	4
 3	6
-<<<<<<< TREE
-SHOW BINLOG EVENTS FROM 107;
-=======
 show binlog events from <binlog_start>;
->>>>>>> MERGE-SOURCE
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-#	107	Query	#	207	use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
-#	207	Query	#	275	BEGIN
-#	275	Table_map	#	317	table_id: # (test.t7)
-#	317	Write_rows	#	373	table_id: # flags: STMT_END_F
-#	373	Query	#	442	COMMIT
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t7)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	ROLLBACK
->>>>>>> MERGE-SOURCE
+master-bin.000001	#	Query	#	#	COMMIT
 SELECT * FROM t7 ORDER BY a,b;
 a	b
 1	2
@@ -196,23 +152,12 @@ INSERT INTO t7 SELECT a,b FROM tt4;
 ROLLBACK;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-<<<<<<< TREE
-SHOW BINLOG EVENTS FROM 107;
-=======
 show binlog events from <binlog_start>;
->>>>>>> MERGE-SOURCE
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-#	107	Query	#	175	BEGIN
-#	175	Table_map	#	217	table_id: # (test.t7)
-#	217	Write_rows	#	273	table_id: # flags: STMT_END_F
-#	273	Query	#	342	COMMIT
-=======
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t7)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
->>>>>>> MERGE-SOURCE
 SELECT * FROM t7 ORDER BY a,b;
 a	b
 1	2
@@ -252,19 +197,10 @@ Create Table	CREATE TABLE `t9` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-<<<<<<< TREE
-SHOW BINLOG EVENTS FROM 107;
-=======
 show binlog events from <binlog_start>;
->>>>>>> MERGE-SOURCE
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-#	107	Query	#	193	use `test`; CREATE TABLE t8 LIKE t4
-#	193	Query	#	332	use `test`; CREATE TABLE `t9` (
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t8 LIKE t4
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE `t9` (
->>>>>>> MERGE-SOURCE
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 )
@@ -334,44 +270,8 @@ a
 1
 2
 3
-<<<<<<< TREE
-SHOW BINLOG EVENTS FROM 107;
-=======
 show binlog events from <binlog_start>;
->>>>>>> MERGE-SOURCE
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-#	107	Query	#	193	use `test`; CREATE TABLE t1 (a INT)
-#	193	Query	#	261	BEGIN
-#	261	Table_map	#	302	table_id: # (test.t1)
-#	302	Write_rows	#	346	table_id: # flags: STMT_END_F
-#	346	Query	#	415	COMMIT
-#	415	Query	#	483	BEGIN
-#	483	Query	#	608	use `test`; CREATE TABLE `t2` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=InnoDB
-#	608	Table_map	#	649	table_id: # (test.t2)
-#	649	Write_rows	#	693	table_id: # flags: STMT_END_F
-#	693	Xid	#	720	COMMIT /* XID */
-#	720	Query	#	788	BEGIN
-#	788	Query	#	913	use `test`; CREATE TABLE `t3` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=InnoDB
-#	913	Table_map	#	954	table_id: # (test.t3)
-#	954	Write_rows	#	998	table_id: # flags: STMT_END_F
-#	998	Xid	#	1025	COMMIT /* XID */
-#	1025	Query	#	1093	BEGIN
-#	1093	Query	#	1218	use `test`; CREATE TABLE `t4` (
-  `a` int(11) DEFAULT NULL
-) ENGINE=InnoDB
-#	1218	Table_map	#	1259	table_id: # (test.t4)
-#	1259	Write_rows	#	1303	table_id: # flags: STMT_END_F
-#	1303	Xid	#	1330	COMMIT /* XID */
-#	1330	Query	#	1398	BEGIN
-#	1398	Table_map	#	1439	table_id: # (test.t1)
-#	1439	Write_rows	#	1483	table_id: # flags: STMT_END_F
-#	1483	Query	#	1552	COMMIT
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -402,7 +302,6 @@ master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
->>>>>>> MERGE-SOURCE
 SHOW TABLES;
 Tables_in_test
 t1
@@ -456,26 +355,8 @@ a
 4
 6
 9
-<<<<<<< TREE
-SHOW BINLOG EVENTS FROM 107;
-=======
 show binlog events from <binlog_start>;
->>>>>>> MERGE-SOURCE
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-#	107	Query	#	193	use `test`; CREATE TABLE t1 (a INT)
-#	193	Query	#	261	BEGIN
-#	261	Table_map	#	302	table_id: # (test.t1)
-#	302	Write_rows	#	346	table_id: # flags: STMT_END_F
-#	346	Query	#	415	COMMIT
-#	415	Query	#	515	use `test`; CREATE TABLE t2 (a INT) ENGINE=INNODB
-#	515	Query	#	583	BEGIN
-#	583	Table_map	#	624	table_id: # (test.t2)
-#	624	Write_rows	#	668	table_id: # flags: STMT_END_F
-#	668	Table_map	#	709	table_id: # (test.t2)
-#	709	Write_rows	#	748	table_id: # flags: STMT_END_F
-#	748	Xid	#	775	COMMIT /* XID */
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -488,7 +369,6 @@ master-bin.000001	#	Write_rows	#	#	table
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
->>>>>>> MERGE-SOURCE
 SELECT * FROM t2 ORDER BY a;
 a
 1
@@ -514,21 +394,8 @@ Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 SELECT * FROM t2 ORDER BY a;
 a
-<<<<<<< TREE
-SHOW BINLOG EVENTS FROM 107;
-=======
 show binlog events from <binlog_start>;
->>>>>>> MERGE-SOURCE
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-=======
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	ROLLBACK
->>>>>>> MERGE-SOURCE
 SELECT * FROM t2 ORDER BY a;
 a
 DROP TABLE t1,t2;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_drop.result'
--- a/mysql-test/suite/rpl/r/rpl_row_drop.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_drop.result	2010-06-18 11:10:53 +0000
@@ -43,16 +43,9 @@ t2
 DROP TABLE t1,t2;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	107	Query	1	193	use `test`; CREATE TABLE t1 (a int)
-master-bin.000001	193	Query	1	279	use `test`; CREATE TABLE t2 (a int)
-master-bin.000001	279	Query	1	383	use `test`; DROP TABLE `t1` /* generated by server */
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int)
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t2 (a int)
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
->>>>>>> MERGE-SOURCE
 SHOW TABLES;
 Tables_in_test
 t2

=== modified file 'mysql-test/suite/rpl/r/rpl_row_event_max_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_event_max_size.result	2010-06-01 07:02:22 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_event_max_size.result	2010-06-18 11:10:53 +0000
@@ -65,4 +65,3 @@ drop table t1;
 call mtr.add_suppression("Slave I/O: Got fatal error 1236 from master when reading data from binary log: .*");
 call mtr.add_suppression("Found invalid event in binary log");
 drop table t1;
-last_io_errno= 1236

=== modified file 'mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result'
--- a/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result	2010-06-18 11:10:53 +0000
@@ -18,13 +18,6 @@ master-bin.000001	#	Query	#	#	use `test`
 select * from t3;
 a
 flush tables;
-<<<<<<< TREE
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; rename table t1 to t5, t2 to t1
-master-bin.000001	#	Query	#	#	use `test`; flush tables
-=======
->>>>>>> MERGE-SOURCE
 select * from t3;
 a
 stop slave;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_log.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log.result	2010-06-18 11:10:53 +0000
@@ -16,35 +16,6 @@ load data infile 'LOAD_FILE' into table 
 select count(*) from t1;
 count(*)
 69
-<<<<<<< TREE
-show binlog events;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	1	#	COMMIT
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	1	#	COMMIT
-show binlog events from 107 limit 1;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-show binlog events from 107 limit 2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-master-bin.000001	#	Query	1	#	BEGIN
-show binlog events from 107 limit 1,4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	1	#	COMMIT
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
@@ -65,10 +36,12 @@ show binlog events from <binlog_start> l
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
 master-bin.000001	#	Query	#	#	BEGIN
-show binlog events from <binlog_start> limit 2,1;
+show binlog events from <binlog_start> limit 1,4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
->>>>>>> MERGE-SOURCE
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	COMMIT
 flush logs;
 create table t3 (a int)ENGINE=MyISAM;
 select * from t1 order by 1 asc;
@@ -248,73 +221,6 @@ show binary logs;
 Log_name	File_size
 slave-bin.000001	#
 slave-bin.000002	#
-<<<<<<< TREE
-show binlog events in 'slave-bin.000001' from 4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-slave-bin.000001	#	Query	1	#	BEGIN
-slave-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	1	#	COMMIT
-slave-bin.000001	#	Query	1	#	use `test`; drop table t1
-slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
-slave-bin.000001	#	Query	1	#	BEGIN
-slave-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	1	#	COMMIT
-slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=MyISAM
-slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
-show binlog events in 'slave-bin.000002' from 4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=MyISAM
-slave-bin.000002	#	Query	1	#	BEGIN
-slave-bin.000002	#	Table_map	1	#	table_id: # (test.t2)
-slave-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-slave-bin.000002	#	Query	1	#	COMMIT
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000002
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000002
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
@@ -338,7 +244,6 @@ slave-bin.000002	#	Table_map	#	#	table_i
 slave-bin.000002	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000002	#	Query	#	#	COMMIT
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_log_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2010-06-18 11:10:53 +0000
@@ -16,35 +16,6 @@ load data infile 'LOAD_FILE' into table 
 select count(*) from t1;
 count(*)
 69
-<<<<<<< TREE
-show binlog events;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	1	#	COMMIT /* XID */
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=InnoDB
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	1	#	COMMIT /* XID */
-show binlog events from 107 limit 1;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
-show binlog events from 107 limit 2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
-master-bin.000001	#	Query	1	#	BEGIN
-show binlog events from 107 limit 1,4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	1	#	COMMIT /* XID */
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
@@ -65,10 +36,12 @@ show binlog events from <binlog_start> l
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
 master-bin.000001	#	Query	#	#	BEGIN
-show binlog events from <binlog_start> limit 2,1;
+show binlog events from <binlog_start> limit 1,4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
->>>>>>> MERGE-SOURCE
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 flush logs;
 create table t3 (a int)ENGINE=InnoDB;
 select * from t1 order by 1 asc;
@@ -248,73 +221,6 @@ show binary logs;
 Log_name	File_size
 slave-bin.000001	#
 slave-bin.000002	#
-<<<<<<< TREE
-show binlog events in 'slave-bin.000001' from 4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
-slave-bin.000001	#	Query	1	#	BEGIN
-slave-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Xid	1	#	COMMIT /* XID */
-slave-bin.000001	#	Query	1	#	use `test`; drop table t1
-slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=InnoDB
-slave-bin.000001	#	Query	1	#	BEGIN
-slave-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Xid	1	#	COMMIT /* XID */
-slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=InnoDB
-slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
-show binlog events in 'slave-bin.000002' from 4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=InnoDB
-slave-bin.000002	#	Query	1	#	BEGIN
-slave-bin.000002	#	Table_map	1	#	table_id: # (test.t2)
-slave-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-slave-bin.000002	#	Xid	1	#	COMMIT /* XID */
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000002
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000002
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
@@ -338,7 +244,6 @@ slave-bin.000002	#	Table_map	#	#	table_i
 slave-bin.000002	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000002	#	Xid	#	#	COMMIT /* XID */
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_max_relay_size.result'
--- a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result	2010-06-18 11:10:53 +0000
@@ -21,51 +21,7 @@ select @@global.max_relay_log_size;
 @@global.max_relay_log_size
 4096
 start slave;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 #
 # Test 2
 #
@@ -75,51 +31,7 @@ set global max_relay_log_size=(5*4096);
 select @@global.max_relay_log_size;
 @@global.max_relay_log_size	20480
 start slave;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 #
 # Test 3: max_relay_log_size = 0
 #
@@ -129,101 +41,13 @@ set global max_relay_log_size=0;
 select @@global.max_relay_log_size;
 @@global.max_relay_log_size	0
 start slave;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 #
 # Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
 #
 stop slave;
 reset slave;
 flush logs;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 #
 # Test 5
 #
@@ -231,101 +55,13 @@ reset slave;
 start slave;
 flush logs;
 create table t1 (a int);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 #
 # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
 #
 flush logs;
 drop table t1;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 flush logs;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB

=== modified file 'mysql-test/suite/rpl/r/rpl_row_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_row_mixing_engines.result	2010-01-05 16:55:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_mixing_engines.result	2010-06-18 11:10:53 +0000
@@ -12240,10 +12240,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B N T S1 T R1 C << -b-b-b-b-b-b-b-b-b-b-b-
@@ -12255,10 +12255,10 @@ master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B N T S1 T R1 C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -12298,10 +12298,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B T N S1 T R1 C << -b-b-b-b-b-b-b-b-b-b-b-
@@ -12313,10 +12313,10 @@ master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T N S1 T R1 C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -12356,10 +12356,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B T S1 N T R1 C << -b-b-b-b-b-b-b-b-b-b-b-
@@ -12371,10 +12371,10 @@ master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T S1 N T R1 C << -e-e-e-e-e-e-e-e-e-e-e-
 

=== modified file 'mysql-test/suite/rpl/r/rpl_row_reset_slave.result'
--- a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result	2010-06-18 11:10:53 +0000
@@ -6,189 +6,20 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
 start slave;
 Master_User	root
 Master_Host	127.0.0.1
-<<<<<<< TREE
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-stop slave;
-=======
 include/stop_slave.inc
->>>>>>> MERGE-SOURCE
 change master to master_user='test';
 Master_User	test
-<<<<<<< TREE
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-reset slave;
-SHOW SLAVE STATUS;
-Slave_IO_State	#
 Master_Host	127.0.0.1
-Master_User	test
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-change master to master_user='root';
-start slave;
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-stop slave;
 reset slave;
-start slave;
-=======
-Master_Host	127.0.0.1
-reset slave;
-Master_User	root
+Master_User	test
 Master_Host	127.0.0.1
+change master to master_user='root';
 include/start_slave.inc
 Master_User	root
 Master_Host	127.0.0.1
 include/stop_slave.inc
 reset slave;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 create temporary table t1 (a int);
 include/stop_slave.inc
 reset slave;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result'
--- a/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result	2009-11-03 19:02:56 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result	2010-06-18 11:10:53 +0000
@@ -12,7 +12,7 @@ INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 INSERT INTO t1 VALUES (6);
 [MASTER] ********* SOW BINLOG EVENTS IN ...  *********
-show binlog events in 'master-bin.000001' from <binlog_start>;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 master-bin.000001	#	Query	#	#	BEGIN
@@ -74,14 +74,14 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 [MASTER] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
-show binlog events from <binlog_start> limit 1,  4;
+show binlog events from <binlog_start> limit 1,4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 [SLAVE] ********* SOW BINLOG EVENTS IN ...   *********
-show binlog events in 'slave-bin.000001' from <binlog_start>;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 slave-bin.000001	#	Query	#	#	BEGIN
@@ -143,7 +143,7 @@ slave-bin.000001	#	Query	#	#	use `test`;
 slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
 [SLAVE] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
-show binlog events from <binlog_start> limit 1,  4;
+show binlog events from <binlog_start> limit 1,4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -190,7 +190,7 @@ slave-relay-bin.000003	#	Rotate	#	#	mast
 slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 [MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT offset,rows  *********
-show relaylog events in 'slave-relay-bin.000003' from <binlog_start> limit 1,  3;
+show relaylog events in 'slave-relay-bin.000003' from <binlog_start> limit 1,3;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
@@ -265,7 +265,7 @@ slave-bin.000001	#	Write_rows	#	#	table_
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Rotate	#	#	slave-bin.000002;pos=4
 [SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
-show relaylog events in 'slave-relay-bin.000005' from <binlog_start>;
+show relaylog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-relay-bin.000005	#	Rotate	#	#	master-bin.000002;pos=4
 slave-relay-bin.000005	#	Rotate	#	#	slave-relay-bin.000006;pos=4

=== modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result	2010-06-18 11:10:53 +0000
@@ -118,253 +118,27 @@ a	b
 SELECT * FROM t2;
 a
 2
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	0
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 INSERT INTO t9 VALUES (4);
 INSERT INTO t4 VALUES (4);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	1658
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 3, test.t4 has type 4
+Last_SQL_Error = Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 INSERT INTO t9 VALUES (5);
 INSERT INTO t5 VALUES (5,10,25);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	1658
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 type mismatch - received type 3, test.t5 has type 4
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'int' to type 'float'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 INSERT INTO t9 VALUES (6);
 INSERT INTO t6 VALUES (6,12,36);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	1658
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 3, test.t6 has type 4
+Last_SQL_Error = Column 2 of table 'test.t6' cannot be converted from type 'int' to type 'float'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 INSERT INTO t9 VALUES (6);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	0
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 INSERT INTO t7 VALUES (1),(2),(3);
 INSERT INTO t8 VALUES (1),(2),(3);
 SELECT * FROM t7 ORDER BY a;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result	2010-06-18 11:10:53 +0000
@@ -118,253 +118,27 @@ a	b
 SELECT * FROM t2;
 a
 2
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	0
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 INSERT INTO t9 VALUES (4);
 INSERT INTO t4 VALUES (4);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	1658
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 3, test.t4 has type 4
+Last_SQL_Error = Column 0 of table 'test.t4' cannot be converted from type 'int' to type 'float'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 INSERT INTO t9 VALUES (5);
 INSERT INTO t5 VALUES (5,10,25);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	1658
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 type mismatch - received type 3, test.t5 has type 4
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'int' to type 'float'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 INSERT INTO t9 VALUES (6);
 INSERT INTO t6 VALUES (6,12,36);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	1658
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	1658
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 3, test.t6 has type 4
+Last_SQL_Error = Column 2 of table 'test.t6' cannot be converted from type 'int' to type 'float'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 INSERT INTO t9 VALUES (6);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	0
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 INSERT INTO t7 VALUES (1),(2),(3);
 INSERT INTO t8 VALUES (1),(2),(3);
 SELECT * FROM t7 ORDER BY a;

=== modified file 'mysql-test/suite/rpl/r/rpl_row_until.result'
--- a/mysql-test/suite/rpl/r/rpl_row_until.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_until.result	2010-06-18 11:10:53 +0000
@@ -20,200 +20,22 @@ n
 2
 3
 4
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	MASTER_POS_DROP_T1
-Relay_Log_Space	#
-Until_Condition	Master
-Until_Log_File	master-bin.000001
-Until_Log_Pos	MASTER_POS_DROP_T1
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-START SLAVE UNTIL MASTER_LOG_FILE='master-no-such-bin.000001', MASTER_LOG_POS=291;
-=======
 START SLAVE UNTIL MASTER_LOG_FILE='master-no-such-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS;
->>>>>>> MERGE-SOURCE
 SELECT * FROM t1;
 n
 1
 2
 3
 4
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	MASTER_POS_DROP_T1
-Relay_Log_Space	#
-Until_Condition	Master
-Until_Log_File	master-no-such-bin.000001
-Until_Log_Pos	291
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', RELAY_LOG_POS=relay_pos_insert1_t2
 SELECT * FROM t2;
 n
 1
 2
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	MASTER_POS_INSERT1_T2
-Relay_Log_Space	#
-Until_Condition	Relay
-Until_Log_File	slave-relay-bin.000002
-Until_Log_Pos	RELAY_POS_INSERT1_T2
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 START SLAVE;
 include/stop_slave.inc
 START SLAVE SQL_THREAD UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=master_pos_create_t2
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	MASTER_POS_DROP_T2
-Relay_Log_Space	#
-Until_Condition	Master
-Until_Log_File	master-bin.000001
-Until_Log_Pos	MASTER_POS_CREATE_T2
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-START SLAVE UNTIL MASTER_LOG_FILE='master-bin', MASTER_LOG_POS=561;
-=======
 START SLAVE UNTIL MASTER_LOG_FILE='master-bin', MASTER_LOG_POS=MASTER_LOG_POS;
->>>>>>> MERGE-SOURCE
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
 START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS, RELAY_LOG_POS=RELAY_LOG_POS;
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL

=== modified file 'mysql-test/suite/rpl/r/rpl_skip_error.result'
--- a/mysql-test/suite/rpl/r/rpl_skip_error.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_skip_error.result	2010-06-18 11:10:53 +0000
@@ -31,51 +31,7 @@ n
 3
 7
 8
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 ==== Clean Up ====
 drop table t1;
 create table t1(a int primary key);
@@ -90,51 +46,7 @@ select * from t1;
 a
 1
 2
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 ==== Clean Up ====
 drop table t1;
 ==== Using Innodb ====

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result	2010-06-18 11:10:53 +0000
@@ -12,9 +12,5 @@ load data infile '../../std_data/rpl_loa
 commit;
 drop table t1;
 drop table t1;
-<<<<<<< TREE
 call mtr.add_suppression("Slave: Can't get stat of .*");
 call mtr.add_suppression("Slave: File.* not found.*");
-=======
-call mtr.add_suppression("Slave: Error writing file 'UNKNOWN' .Errcode: 9. Error_code: 3");
->>>>>>> MERGE-SOURCE

=== modified file 'mysql-test/suite/rpl/r/rpl_slave_skip.result'
--- a/mysql-test/suite/rpl/r/rpl_slave_skip.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result	2010-06-18 11:10:53 +0000
@@ -42,52 +42,7 @@ c	d
 2	8
 3	18
 **** On Slave ****
-<<<<<<< TREE
-START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762;
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	1116
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	763
-Relay_Log_Space	#
-Until_Condition	Master
-Until_Log_File	master-bin.000001
-Until_Log_Pos	762
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS;
->>>>>>> MERGE-SOURCE
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 START SLAVE;
 SELECT * FROM t1;
@@ -111,58 +66,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	User var	#	#	@`foo`=12
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES(@foo, 2*@foo)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=106;
-=======
 START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS;
->>>>>>> MERGE-SOURCE
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	387
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	387
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 **** On Master ****
 DROP TABLE t1, t2;
 SET SESSION BINLOG_FORMAT=ROW;

=== modified file 'mysql-test/suite/rpl/r/rpl_sp.result'
--- a/mysql-test/suite/rpl/r/rpl_sp.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_sp.result	2010-06-18 11:10:53 +0000
@@ -418,27 +418,15 @@ set b = 8;
 insert into t1 values (b);
 insert into t1 values (unix_timestamp());
 end
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values ( NAME_CONST('b',8))
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (unix_timestamp())
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `foo2`()
 select * from mysqltest1.t1
 master-bin.000001	#	Query	#	#	use `mysqltest1`; alter procedure foo2 contains sql
@@ -457,49 +445,25 @@ begin
 insert into t2 values(3);
 insert into t1 values (5);
 end
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(3)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (15)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(3)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; alter procedure foo4 sql security invoker
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(3)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (5)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t2
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; alter table t2 add unique (a)
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo4
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `foo4`()
@@ -507,15 +471,9 @@ master-bin.000001	#	Query	#	#	use `mysql
 begin
 insert into t2 values(20),(20);
 end
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(20),(20)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo4
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo2
@@ -526,48 +484,27 @@ begin
 insert into t1 values (x);
 return x+2;
 end
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete t1,t2 from t1,t2
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(20)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(fn1(21))
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop function fn1
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`() RETURNS int(11)
     NO SQL
 begin
 return unix_timestamp();
 end
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values(fn1())
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` FUNCTION `fn2`() RETURNS int(11)
     NO SQL
 begin
@@ -578,15 +515,9 @@ master-bin.000001	#	Query	#	#	use `mysql
 begin
 return 0;
 end
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t2
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; alter table t2 add unique (a)
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop function fn1
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
@@ -594,53 +525,26 @@ begin
 insert into t2 values(x),(x);
 return 10;
 end
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(100)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(20)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` trigger trg before insert on t1 for each row set new.a= 10
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (1)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop trigger trg
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (1)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `foo`()
     READS SQL DATA
 select * from t1
@@ -661,15 +565,9 @@ return var;
 end
 master-bin.000001	#	Query	#	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 as a
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 (a) values (f1())
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `test`; drop view v1
 master-bin.000001	#	Query	#	#	use `test`; drop function f1
 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE IF EXISTS p1
@@ -677,15 +575,9 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(col VARCHAR(10))
 master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(arg VARCHAR(10))
 INSERT INTO t1 VALUES(arg)
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES( NAME_CONST('arg',_latin1'test' COLLATE 'latin1_swedish_ci'))
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE p1
 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE IF EXISTS p1
 master-bin.000001	#	Query	#	#	use `test`; DROP FUNCTION IF EXISTS f1
@@ -703,32 +595,17 @@ master-bin.000001	#	Query	#	#	create dat
 master-bin.000001	#	Query	#	#	use `mysqltest2`; create table t ( t integer )
 master-bin.000001	#	Query	#	#	use `mysqltest2`; CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqltest`.`test`()
 begin end
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t values ( 1 )
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest2`; CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
 begin
 insert into t values (1);
 return 0;
 end
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	BEGIN
-=======
->>>>>>> MERGE-SOURCE
 master-bin.000001	#	Query	#	#	use `mysqltest`; SELECT `mysqltest2`.`f1`()
-<<<<<<< TREE
 master-bin.000001	#	Query	#	#	COMMIT
-=======
-set @@global.log_bin_trust_routine_creators= @old_log_bin_trust_routine_creators;
-Warnings:
-Warning	1287	'@@log_bin_trust_routine_creators' is deprecated and will be removed in a future release. Please use '@@log_bin_trust_function_creators' instead
->>>>>>> MERGE-SOURCE
 set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
 set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
 drop database mysqltest;

=== modified file 'mysql-test/suite/rpl/r/rpl_ssl.result'
--- a/mysql-test/suite/rpl/r/rpl_ssl.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ssl.result	2010-06-18 11:10:53 +0000
@@ -24,18 +24,7 @@ Master_SSL_CA_Path	
 Master_SSL_CA_File	MYSQL_TEST_DIR/std_data/cacert.pem
 Master_SSL_Cert	MYSQL_TEST_DIR/std_data/client-cert.pem
 Master_SSL_Key	MYSQL_TEST_DIR/std_data/client-key.pem
-<<<<<<< TREE
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 STOP SLAVE;
 select * from t1;
 t
@@ -46,18 +35,7 @@ Master_SSL_CA_Path	
 Master_SSL_CA_File	MYSQL_TEST_DIR/std_data/cacert.pem
 Master_SSL_Cert	MYSQL_TEST_DIR/std_data/client-cert.pem
 Master_SSL_Key	MYSQL_TEST_DIR/std_data/client-key.pem
-<<<<<<< TREE
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 drop user replssl@localhost;
 drop table t1;
 End of 5.0 tests

=== modified file 'mysql-test/suite/rpl/r/rpl_ssl1.result'
--- a/mysql-test/suite/rpl/r/rpl_ssl1.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_ssl1.result	2010-06-18 11:10:53 +0000
@@ -23,18 +23,7 @@ Master_SSL_CA_Path	
 Master_SSL_CA_File	MYSQL_TEST_DIR/std_data/cacert.pem
 Master_SSL_Cert	MYSQL_TEST_DIR/std_data/client-cert.pem
 Master_SSL_Key	MYSQL_TEST_DIR/std_data/client-key.pem
-<<<<<<< TREE
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 stop slave;
 change master to master_user='root',master_password='', master_ssl=0;
 start slave;
@@ -45,18 +34,7 @@ Master_SSL_CA_Path	
 Master_SSL_CA_File	MYSQL_TEST_DIR/std_data/cacert.pem
 Master_SSL_Cert	MYSQL_TEST_DIR/std_data/client-cert.pem
 Master_SSL_Key	MYSQL_TEST_DIR/std_data/client-key.pem
-<<<<<<< TREE
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 stop slave;
 change master to
 master_host="localhost",
@@ -77,16 +55,5 @@ Master_SSL_CA_Path	
 Master_SSL_CA_File	MYSQL_TEST_DIR/std_data/cacert.pem
 Master_SSL_Cert	MYSQL_TEST_DIR/std_data/client-cert.pem
 Master_SSL_Key	MYSQL_TEST_DIR/std_data/client-key.pem
-<<<<<<< TREE
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	Yes
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 drop table t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result	2010-06-18 11:10:53 +0000
@@ -18,13 +18,6 @@ master-bin.000001	#	Query	#	#	use `test`
 select * from t3;
 a
 flush tables;
-<<<<<<< TREE
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; rename table t1 to t5, t2 to t1
-master-bin.000001	#	Query	#	#	use `test`; flush tables
-=======
->>>>>>> MERGE-SOURCE
 select * from t3;
 a
 stop slave;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result	2010-06-18 11:10:53 +0000
@@ -20,7 +20,6 @@ COUNT(*)
 5000
 truncate table t1;
 insert delayed into t1 values(10, "my name");
-<<<<<<< TREE
 flush table t1;
 insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
 ERROR 23000: Duplicate entry '10' for key 'PRIMARY'
@@ -52,68 +51,20 @@ CREATE TABLE t1(a int, UNIQUE(a));
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 INSERT DELAYED IGNORE INTO t1 VALUES(1);
 flush table t1;
-show binlog events in 'master-bin.000002' LIMIT 2,2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-x	x	x	x	x	BEGIN
-x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
 select * from t1;
 a
 1
 On slave
-show binlog events in 'slave-bin.000002' LIMIT 2,2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-x	x	x	x	x	BEGIN
-x	x	x	x	x	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
-select * from t1;
-a
-1
-drop table t1;
-FLUSH LOGS;
-FLUSH LOGS;
-End of 5.0 tests
-=======
-insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
-ERROR 23000: Duplicate entry '10' for key 'PRIMARY'
-flush table t1;
-select * from t1;
-id	name
-10	my name
-select * from t1;
-id	name
-10	my name
-delete from t1 where id!=10;
-insert delayed into t1 values(20, "is Bond"), (10, "James Bond");
-ERROR 23000: Duplicate entry '10' for key 'PRIMARY'
-flush table t1;
-select * from t1;
-id	name
-10	my name
-20	is Bond
-select * from t1;
-id	name
-10	my name
-20	is Bond
-USE test;
-DROP SCHEMA mysqlslap;
-use test;
-FLUSH LOGS;
-FLUSH LOGS;
-CREATE TABLE t1(a int, UNIQUE(a));
-INSERT DELAYED IGNORE INTO t1 VALUES(1);
-INSERT DELAYED IGNORE INTO t1 VALUES(1);
-flush table t1;
-show binlog events in 'master-bin.000002' from <binlog_start> limit 1,2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	#	Query	#	#	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
-master-bin.000002	#	Query	#	#	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
-select * from t1;
-a
-1
-On slave
-show binlog events in 'slave-bin.000002' from <binlog_start> limit 1,2;
+show binlog events in 'slave-bin.000002' from <binlog_start> limit 1,6;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+slave-bin.000002	#	Query	#	#	BEGIN
 slave-bin.000002	#	Query	#	#	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+slave-bin.000002	#	Query	#	#	COMMIT
+slave-bin.000002	#	Query	#	#	BEGIN
 slave-bin.000002	#	Query	#	#	use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
+slave-bin.000002	#	Query	#	#	COMMIT
 select * from t1;
 a
 1
@@ -121,61 +72,3 @@ drop table t1;
 FLUSH LOGS;
 FLUSH LOGS;
 End of 5.0 tests
-set @@global.binlog_format = mixed;
-CREATE SCHEMA IF NOT EXISTS mysqlslap;
-USE mysqlslap;
-select @@global.binlog_format;
-@@global.binlog_format
-MIXED
-CREATE TABLE t1 (id INT primary key auto_increment, name VARCHAR(64));
-FLUSH TABLE t1;
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-5000
-use mysqlslap;
-SELECT COUNT(*) FROM t1;
-COUNT(*)
-5000
-truncate table t1;
-insert delayed into t1 values(10, "my name");
-insert delayed into t1 values(10, "is Bond"), (20, "James Bond");
-flush table t1;
-select * from t1;
-id	name
-10	my name
-20	James Bond
-select * from t1;
-id	name
-10	my name
-20	James Bond
-delete from t1 where id!=10;
-insert delayed into t1 values(20, "is Bond"), (10, "James Bond");
-flush table t1;
-select * from t1;
-id	name
-10	my name
-20	is Bond
-select * from t1;
-id	name
-10	my name
-20	is Bond
-USE test;
-DROP SCHEMA mysqlslap;
-use test;
-CREATE TABLE t1(a int, UNIQUE(a));
-INSERT DELAYED IGNORE INTO t1 VALUES(1);
-INSERT DELAYED IGNORE INTO t1 VALUES(1);
-flush table t1;
-select * from t1;
-a
-1
-On slave
-select * from t1;
-a
-1
-drop table t1;
-FLUSH LOGS;
-FLUSH LOGS;
-End of 5.0 tests
-set @@global.binlog_format = @old_global_binlog_format;
->>>>>>> MERGE-SOURCE

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_log.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result	2010-06-18 11:10:53 +0000
@@ -16,55 +16,32 @@ load data infile 'LOAD_FILE' into table 
 select count(*) from t1;
 count(*)
 69
-<<<<<<< TREE
-show binlog events;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Intvar	1	#	INSERT_ID=1
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (NULL)
-master-bin.000001	#	Query	1	#	COMMIT
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
-master-bin.000001	#	Execute_load_query	1	#	use `test`; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' IGNORE 1 LINES  (`word`) ;file_id=1
-master-bin.000001	#	Query	1	#	COMMIT
-show binlog events from 107 limit 1;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-show binlog events from 107 limit 2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-master-bin.000001	#	Query	1	#	BEGIN
-show binlog events from 107 limit 1,4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Intvar	1	#	INSERT_ID=1
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (NULL)
-master-bin.000001	#	Query	1	#	COMMIT
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Intvar	#	#	INSERT_ID=1
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (NULL)
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; drop table t1
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
 master-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' IGNORE 1 LINES  (`word`) ;file_id=#
+master-bin.000001	#	Query	#	#	COMMIT
 show binlog events from <binlog_start> limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
 show binlog events from <binlog_start> limit 2;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-master-bin.000001	#	Intvar	#	#	INSERT_ID=1
-show binlog events from <binlog_start> limit 2,1;
+master-bin.000001	#	Query	#	#	BEGIN
+show binlog events from <binlog_start> limit 1,4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Intvar	#	#	INSERT_ID=1
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (NULL)
->>>>>>> MERGE-SOURCE
+master-bin.000001	#	Query	#	#	COMMIT
 flush logs;
 create table t3 (a int)ENGINE=MyISAM;
 select * from t1 order by 1 asc;
@@ -230,18 +207,11 @@ master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002' from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000002	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
-master-bin.000002	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=MyISAM
-master-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=MyISAM
-master-bin.000002	#	Query	1	#	BEGIN
-master-bin.000002	#	Query	1	#	use `test`; insert into t2 values (1)
-master-bin.000002	#	Query	1	#	COMMIT
-=======
 master-bin.000002	#	Query	#	#	use `test`; create table t3 (a int)ENGINE=MyISAM
 master-bin.000002	#	Query	#	#	use `test`; create table t2 (n int)ENGINE=MyISAM
+master-bin.000002	#	Query	#	#	BEGIN
 master-bin.000002	#	Query	#	#	use `test`; insert into t2 values (1)
->>>>>>> MERGE-SOURCE
+master-bin.000002	#	Query	#	#	COMMIT
 show binary logs;
 Log_name	File_size
 master-bin.000001	#
@@ -250,89 +220,28 @@ show binary logs;
 Log_name	File_size
 slave-bin.000001	#
 slave-bin.000002	#
-<<<<<<< TREE
-show binlog events in 'slave-bin.000001' from 4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-slave-bin.000001	#	Query	1	#	BEGIN
-slave-bin.000001	#	Intvar	1	#	INSERT_ID=1
-slave-bin.000001	#	Query	1	#	use `test`; insert into t1 values (NULL)
-slave-bin.000001	#	Query	1	#	COMMIT
-slave-bin.000001	#	Query	1	#	use `test`; drop table t1
-slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
-slave-bin.000001	#	Query	1	#	BEGIN
-slave-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
-slave-bin.000001	#	Execute_load_query	1	#	use `test`; LOAD DATA INFILE '../../tmp/SQL_LOAD-2-1-1.data' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' IGNORE 1 LINES  (`word`) ;file_id=1
-slave-bin.000001	#	Query	1	#	COMMIT
-slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=MyISAM
-slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
-show binlog events in 'slave-bin.000002' from 4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=MyISAM
-slave-bin.000002	#	Query	1	#	BEGIN
-slave-bin.000002	#	Query	1	#	use `test`; insert into t2 values (1)
-slave-bin.000002	#	Query	1	#	COMMIT
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000002
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000002
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
+slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Intvar	#	#	INSERT_ID=1
 slave-bin.000001	#	Query	#	#	use `test`; insert into t1 values (NULL)
+slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Query	#	#	use `test`; drop table t1
 slave-bin.000001	#	Query	#	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
+slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=#
 slave-bin.000001	#	Execute_load_query	#	#	use `test`; LOAD DATA INFILE '../../tmp/SQL_LOAD-2-1-1.data' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' IGNORE 1 LINES  (`word`) ;file_id=#
+slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Query	#	#	use `test`; create table t3 (a int)ENGINE=MyISAM
 slave-bin.000001	#	Rotate	#	#	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000002	#	Query	#	#	use `test`; create table t2 (n int)ENGINE=MyISAM
+slave-bin.000002	#	Query	#	#	BEGIN
 slave-bin.000002	#	Query	#	#	use `test`; insert into t2 values (1)
+slave-bin.000002	#	Query	#	#	COMMIT
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result	2010-06-18 11:10:53 +0000
@@ -21,51 +21,7 @@ select @@global.max_relay_log_size;
 @@global.max_relay_log_size
 4096
 start slave;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 #
 # Test 2
 #
@@ -75,51 +31,7 @@ set global max_relay_log_size=(5*4096);
 select @@global.max_relay_log_size;
 @@global.max_relay_log_size	20480
 start slave;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 #
 # Test 3: max_relay_log_size = 0
 #
@@ -129,101 +41,13 @@ set global max_relay_log_size=0;
 select @@global.max_relay_log_size;
 @@global.max_relay_log_size	0
 start slave;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 #
 # Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
 #
 stop slave;
 reset slave;
 flush logs;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 #
 # Test 5
 #
@@ -231,101 +55,13 @@ reset slave;
 start slave;
 flush logs;
 create table t1 (a int);
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 #
 # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
 #
 flush logs;
 drop table t1;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 flush logs;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result	2009-11-03 19:02:56 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result	2010-06-18 11:10:53 +0000
@@ -12,7 +12,7 @@ INSERT INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (5);
 INSERT INTO t1 VALUES (6);
 [MASTER] ********* SOW BINLOG EVENTS IN ...  *********
-show binlog events in 'master-bin.000001' from <binlog_start>;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 master-bin.000001	#	Query	#	#	BEGIN
@@ -62,14 +62,14 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
 [MASTER] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
-show binlog events from <binlog_start> limit 1,  4;
+show binlog events from <binlog_start> limit 1,4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 [SLAVE] ********* SOW BINLOG EVENTS IN ...   *********
-show binlog events in 'slave-bin.000001' from <binlog_start>;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 slave-bin.000001	#	Query	#	#	BEGIN
@@ -119,7 +119,7 @@ slave-bin.000001	#	Query	#	#	use `test`;
 slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
 [SLAVE] ********* SOW BINLOG EVENTS ... LIMIT offset,rows  *********
-show binlog events from <binlog_start> limit 1,  4;
+show binlog events from <binlog_start> limit 1,4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Query	#	#	BEGIN
 slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (1)
@@ -160,7 +160,7 @@ slave-relay-bin.000003	#	Rotate	#	#	mast
 slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
 [MASTER] ********* SOW RELAYLOG EVENTS ... LIMIT offset,rows  *********
-show relaylog events in 'slave-relay-bin.000003' from <binlog_start> limit 1,  3;
+show relaylog events in 'slave-relay-bin.000003' from <binlog_start> limit 1,3;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-relay-bin.000003	#	Format_desc	#	#	SERVER_VERSION, BINLOG_VERSION
 slave-relay-bin.000003	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT)
@@ -223,7 +223,7 @@ slave-bin.000001	#	Query	#	#	use `test`;
 slave-bin.000001	#	Query	#	#	COMMIT
 slave-bin.000001	#	Rotate	#	#	slave-bin.000002;pos=4
 [SLAVE] ********* SOW RELAYLOG EVENTS IN ... *********
-show relaylog events in 'slave-relay-bin.000005' from <binlog_start>;
+show relaylog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-relay-bin.000005	#	Rotate	#	#	master-bin.000002;pos=4
 slave-relay-bin.000005	#	Rotate	#	#	slave-relay-bin.000006;pos=4

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result	2010-06-16 14:15:39 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result	2010-06-18 11:10:53 +0000
@@ -10178,9 +10178,9 @@ COMMIT;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (318, 4)
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (318, 7)
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B N T S1 T R1 C << -b-b-b-b-b-b-b-b-b-b-b-
@@ -10190,9 +10190,9 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (318, 4)
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (318, 7)
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B N T S1 T R1 C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -10232,9 +10232,9 @@ COMMIT;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (319, 2)
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (319, 7)
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B T N S1 T R1 C << -b-b-b-b-b-b-b-b-b-b-b-
@@ -10244,9 +10244,9 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (319, 2)
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (319, 7)
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T N S1 T R1 C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -10286,9 +10286,9 @@ COMMIT;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (320, 2)
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (320, 7)
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> C << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B T S1 N T R1 C << -b-b-b-b-b-b-b-b-b-b-b-
@@ -10298,9 +10298,9 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (320, 2)
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (320, 7)
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T S1 N T R1 C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -11248,9 +11248,9 @@ ROLLBACK;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 2)
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 5)
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B T S1 T CT R1 R << -b-b-b-b-b-b-b-b-b-b-b-
@@ -11260,9 +11260,9 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 2)
-master-bin.000001	#	Query	#	#	use `test`; SAVEPOINT s1
+master-bin.000001	#	Query	#	#	SAVEPOINT s1
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 5)
-master-bin.000001	#	Query	#	#	use `test`; ROLLBACK TO s1
+master-bin.000001	#	Query	#	#	ROLLBACK TO s1
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T S1 T CT R1 R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -11482,18 +11482,6 @@ master-bin.000001	#	Query	#	#	use `test`
 ###################################################################################
 #                                        CLEAN
 ###################################################################################
-DROP TABLE tt_1;
-DROP TABLE tt_2;
-DROP TABLE tt_3;
-DROP TABLE tt_4;
-DROP TABLE nt_1;
-DROP TABLE nt_2;
-DROP TABLE nt_3;
-DROP TABLE nt_4;
-DROP PROCEDURE pc_i_tt_3;
-DROP FUNCTION f1;
-DROP FUNCTION f2;
-stop slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 reset master;
 reset slave;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_reset_slave.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2010-06-18 11:10:53 +0000
@@ -6,189 +6,20 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
 start slave;
 Master_User	root
 Master_Host	127.0.0.1
-<<<<<<< TREE
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-stop slave;
-=======
 include/stop_slave.inc
->>>>>>> MERGE-SOURCE
 change master to master_user='test';
 Master_User	test
-<<<<<<< TREE
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-reset slave;
-SHOW SLAVE STATUS;
-Slave_IO_State	#
 Master_Host	127.0.0.1
-Master_User	test
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	
-Slave_IO_Running	No
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-change master to master_user='root';
-start slave;
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-stop slave;
 reset slave;
-start slave;
-=======
-Master_Host	127.0.0.1
-reset slave;
-Master_User	root
+Master_User	test
 Master_Host	127.0.0.1
+change master to master_user='root';
 include/start_slave.inc
 Master_User	root
 Master_Host	127.0.0.1
 include/stop_slave.inc
 reset slave;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 create temporary table t1 (a int);
 include/stop_slave.inc
 reset slave;

=== modified file 'mysql-test/suite/rpl/r/rpl_stm_until.result'
--- a/mysql-test/suite/rpl/r/rpl_stm_until.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_stm_until.result	2010-06-18 11:10:53 +0000
@@ -17,105 +17,6 @@ insert into t2 values (3),(4);
 drop table t2;
 ==== Replicate one event at a time on slave ====
 [on slave]
-<<<<<<< TREE
-start slave until master_log_file='master-bin.000001', master_log_pos=323;
-select * from t1;
-n
-1
-2
-3
-4
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	Master
-Until_Log_File	master-bin.000001
-Until_Log_Pos	323
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
-select * from t1;
-n
-1
-2
-3
-4
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	Master
-Until_Log_File	master-no-such-bin.000001
-Until_Log_Pos	291
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=891;
-=======
 start slave until master_log_file='MASTER_LOG_FILE', master_log_pos=MASTER_LOG_POS;
 select * from t1;
 n
@@ -131,105 +32,15 @@ n
 3
 4
 start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=RELAY_LOG_POS;
->>>>>>> MERGE-SOURCE
 select * from t2;
 n
 1
 2
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	Relay
-Until_Log_File	slave-relay-bin.000004
-Until_Log_Pos	891
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
->>>>>>> MERGE-SOURCE
 start slave;
 [on master]
 [on slave]
 include/stop_slave.inc
-<<<<<<< TREE
-start slave until master_log_file='master-bin.000001', master_log_pos=776;
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	Master
-Until_Log_File	master-bin.000001
-Until_Log_Pos	776
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 start slave until master_log_file='MASTER_LOG_FILE', master_log_pos=MASTER_LOG_POS;
->>>>>>> MERGE-SOURCE
 ==== Test various error conditions ====
 start slave until master_log_file='master-bin', master_log_pos=MASTER_LOG_POS;
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL

=== modified file 'mysql-test/suite/rpl/r/rpl_temporary_errors.result'
--- a/mysql-test/suite/rpl/r/rpl_temporary_errors.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_temporary_errors.result	2010-06-18 11:10:53 +0000
@@ -39,51 +39,7 @@ a	b
 2	2
 3	3
 4	4
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 DROP TABLE t1;
 **** On Master ****
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl/t/rpl_heartbeat.test'
--- a/mysql-test/suite/rpl/t/rpl_heartbeat.test	2009-10-10 10:27:07 +0000
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test	2010-06-18 11:10:53 +0000
@@ -114,7 +114,8 @@ create table t1 (f1 int);
 
 #connection slave;
 sync_slave_with_master;
-source include/show_slave_status.inc;
+let $slave_param= Relay_Log_File;
+let $slave_param_value= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1);
 
 # there is an explicit sleep lasting longer than slave_net_timeout
 # to ensure that nothing will come to slave from master for that period.
@@ -124,7 +125,7 @@ source include/show_slave_status.inc;
 real_sleep 15;
 
 # check (compare with the previous show's results) that no rotation happened
-source include/show_slave_status.inc;
+source include/check_slave_param.inc;
 
 ###
 ### SHOW STATUS like 'Slave_heartbeat_period' and 'Slave_received_heartbeats'

=== modified file 'mysql-test/suite/rpl/t/rpl_row_event_max_size.test'
--- a/mysql-test/suite/rpl/t/rpl_row_event_max_size.test	2010-06-01 07:02:22 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_event_max_size.test	2010-06-18 11:10:53 +0000
@@ -71,7 +71,5 @@ call mtr.add_suppression("Found invalid 
 
 # Show slave last IO errno
 drop table t1;
+let slave_io_errno= 1236;
 source include/wait_for_slave_io_error.inc;
-let $last_io_errno= query_get_value("show slave status", Last_IO_Errno, 1);
---echo last_io_errno= $last_io_errno
-

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result	2010-06-18 11:10:53 +0000
@@ -140,51 +140,6 @@ set GLOBAL slave_transaction_retries=1;
 **** On Master ****
 UPDATE t1 SET `nom`="DEAD" WHERE `nid`=1;
 **** On Slave ****
-<<<<<<< TREE
-SHOW SLAVE STATUS;;
-Slave_IO_State	<Slave_IO_State>
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	<Read_Master_Log_Pos>
-Relay_Log_File	<Relay_Log_File>
-Relay_Log_Pos	<Relay_Log_Pos>
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	No
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	<Replicate_Ignore_Table>
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	<Last_Errno>
-Last_Error	<Last_Error>
-Skip_Counter	0
-Exec_Master_Log_Pos	<Exec_Master_Log_Pos>
-Relay_Log_Space	<Relay_Log_Space>
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	<Seconds_Behind_Master>
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	<Last_SQL_Errno>
-Last_SQL_Error	<Last_SQL_Error>
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
-Last_SQL_Error = Could not execute Write_rows event on table test.t1; Got temporary error 266 'Time-out in NDB, probably caused by deadlock' from NDB, Error_code: 1297; Lock wait timeout exceeded; try restarting transaction, Error_code: 1205; handler error HA_ERR_LOCK_WAIT_TIMEOUT; the event's master log master-bin.000001, end_log_pos 6834
->>>>>>> MERGE-SOURCE
 set GLOBAL slave_transaction_retries=10;
 include/start_slave.inc
 select * from t1 order by nid;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result	2010-03-03 13:33:43 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_binlog_format_errors.result	2010-06-18 11:10:53 +0000
@@ -56,7 +56,7 @@ INSERT INTO t_slave_stmt VALUES (1);
 [on slave]
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Cannot execute row injection: binlogging impossible since at least one table uses a storage engine limited to statement-logging.' on opening tables
-set global sql_slave_skip_counter=1;
+SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 include/start_slave.inc
 SELECT * FROM t_slave_stmt /* should be empty */;
 a
@@ -153,7 +153,7 @@ INSERT INTO t VALUES (COALESCE(1, UUID()
 [on slave]
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Cannot execute row injection: binlogging impossible since BINLOG_FORMAT = STATEMENT.' on opening tables
-set global sql_slave_skip_counter=1;
+SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
 include/start_slave.inc
 SELECT * FROM t /* should be empty */;
 a

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result	2010-06-18 11:10:53 +0000
@@ -17,99 +17,11 @@ SELECT * FROM t1 ORDER BY a;
 a	b
 1	2
 2	3
-<<<<<<< TREE
-show slave status;;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	2
 2	3
-<<<<<<< TREE
-show slave status;;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	#
-Connect_Retry	60
-Master_Log_File	slave-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	slave-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	2
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 STOP SLAVE;
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result	2010-06-18 11:10:53 +0000
@@ -14,51 +14,7 @@ INSERT INTO t1 VALUES (2,3);
 STOP SLAVE;
 CHANGE MASTER TO MASTER_HOST="127.0.0.1",MASTER_PORT=SLAVE_PORT,MASTER_USER="root";
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	SLAVE_PORT
-Connect_Retry	60
-Master_Log_File	slave-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	slave-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	2
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	2
@@ -69,49 +25,5 @@ SELECT * FROM t1 ORDER BY a;
 a	b
 1	2
 2	3
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result	2010-06-18 11:10:53 +0000
@@ -57,11 +57,7 @@ a	b	c
 3	4	QA TESTING
 *** Start Slave ***
 START SLAVE;
-<<<<<<< TREE
-Slave failed with Error 1658
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 2 of table 'test.t2' cannot be converted from type 'char(10)' to type 'char(5)'
 STOP SLAVE;
 RESET SLAVE;
 SELECT * FROM t2 ORDER BY a;
@@ -88,18 +84,12 @@ set @b1 = 'b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
+Last_SQL_Error = Column 0 of table 'test.t3' cannot be converted from type 'tinyblob' to type 'int(11)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t3  ***
 DROP TABLE t3;
 *** Create t4 on slave  ***
@@ -119,18 +109,12 @@ START SLAVE;
 INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
 (30000.22,4,'QA TESTING');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
+Last_SQL_Error = Column 0 of table 'test.t4' cannot be converted from type 'decimal(8,2)' to type 'int(11)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t4  ***
 DROP TABLE t4;
 *** Create t5 on slave  ***
@@ -150,18 +134,12 @@ START SLAVE;
 INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
 (2,'JOE',300.01,0,'b2b2',1.0000009);
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'varchar(6)' to type 'char(5)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t5  ***
 DROP TABLE t5;
 *** Create t6 on slave  ***
@@ -180,13 +158,9 @@ START SLAVE;
 INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
 (2,'JOE',300.01,0);
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 1 of table 'test.t6' cannot be converted from type 'varchar(6)' to type 'char(5)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
 *** Drop t6  ***
 DROP TABLE t6;
@@ -258,18 +232,12 @@ set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
+Last_SQL_Error = Column 2 of table 'test.t10' cannot be converted from type 'char(5)' to type 'double'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t10  ***
 DROP TABLE t10;
 *** Create t11 on slave  ***
@@ -288,18 +256,12 @@ set @b1 = 'b1b1b1b1';
 set @b1 = concat(@b1,@b1);
 INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
+Last_SQL_Error = Column 2 of table 'test.t11' cannot be converted from type 'varchar(254)' to type 'int(11)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Drop t11  ***
 DROP TABLE t11;
 *** Create t12 on slave  ***
@@ -509,16 +471,10 @@ ALTER TABLE t15 ADD COLUMN c6 INT AFTER 
 ********************************************
 *** Expect slave to fail with Error 1060 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1060
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
 Last_SQL_Error = Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 1;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 *** Try to insert in master ****
 INSERT INTO t15 () VALUES(5,2.00,'Replication Testing',@b1,'Buda',2);
 SELECT * FROM t15 ORDER BY c1;
@@ -616,17 +572,11 @@ START SLAVE;
 *** Master Data Insert ***
 INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
 ********************************************
-*** Expect slave to fail with Error 1522 ***
+*** Expect slave to fail with Error 1658 ***
 ********************************************
-<<<<<<< TREE
-Slave failed with Error 1658
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
-START SLAVE;
-=======
 --source include/wait_for_slave_sql_error_and_skip.inc
-Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
+Last_SQL_Error = Column 0 of table 'test.t17' cannot be converted from type 'bigint' to type 'smallint(6)'
 SET GLOBAL SQL_SLAVE_SKIP_COUNTER= 2;
 include/start_slave.inc
->>>>>>> MERGE-SOURCE
 ** DROP table t17 ***
 DROP TABLE t17;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result	2010-06-18 11:10:53 +0000
@@ -32,23 +32,11 @@ SELECT * FROM t1 ORDER BY c3;
 c1	c2	c3
 row3	C	3
 row4	D	4
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id
-<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	Yes	Yes				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>	No	<Last_IO_Errno>	<Last_IO_Error>	0			1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 STOP SLAVE;
 CHANGE MASTER TO
 master_log_file = 'master-bin.000001',
 master_log_pos = <the_pos> ;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id
-<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	No	No				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>	No	<Last_IO_Errno>	<Last_IO_Error>	0			1
-=======
->>>>>>> MERGE-SOURCE
 START SLAVE;
 SELECT * FROM t1 ORDER BY c3;
 c1	c2	c3
@@ -74,11 +62,5 @@ COMMIT;
 SELECT * FROM t1;
 c1	c2	c3
 row2	new on slave	2
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error	Replicate_Ignore_Server_Ids	Master_Server_Id
-<Slave_IO_State>	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	<Read_Master_Log_Pos>	<Relay_Log_File>	<Relay_Log_Pos>	master-bin.000001	Yes	Yes				<Replicate_Ignore_Table>			0		0	<Exec_Master_Log_Pos>	<Relay_Log_Space>	None		0	No						<Seconds_Behind_Master>	<Last_IO_Errno>	<Last_IO_Error>		0			1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 DROP TABLE IF EXISTS t1;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2010-06-18 11:10:53 +0000
@@ -16,39 +16,6 @@ load data infile 'LOAD_FILE' into table 
 select count(*) from t1;
 count(*)
 69
-<<<<<<< TREE
-show binlog events;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Table_map	1	#	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	#	Write_rows	1	#	table_id: #
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	1	#	COMMIT
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Table_map	1	#	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	#	Write_rows	1	#	table_id: #
-master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	1	#	COMMIT
-show binlog events from 107 limit 1;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
-show binlog events from 107 limit 2;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
-master-bin.000001	#	Query	1	#	BEGIN
-show binlog events from 107 limit 1,4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	BEGIN
-master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-master-bin.000001	#	Table_map	1	#	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	#	Write_rows	1	#	table_id: #
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
@@ -73,10 +40,12 @@ show binlog events from <binlog_start> l
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
 master-bin.000001	#	Query	#	#	BEGIN
-show binlog events from <binlog_start> limit 2,1;
+show binlog events from <binlog_start> limit 1,4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
->>>>>>> MERGE-SOURCE
+master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	#	Write_rows	#	#	table_id: #
 flush logs;
 create table t3 (a int)ENGINE=NDB;
 select * from t1 order by 1 asc;
@@ -262,79 +231,6 @@ show binary logs;
 Log_name	File_size
 slave-bin.000001	#
 slave-bin.000002	#
-<<<<<<< TREE
-show binlog events in 'slave-bin.000001' from 4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
-slave-bin.000001	#	Query	2	#	BEGIN
-slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)
-slave-bin.000001	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)
-slave-bin.000001	#	Write_rows	2	#	table_id: #
-slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	2	#	COMMIT
-slave-bin.000001	#	Query	1	#	use `test`; drop table t1
-slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB
-slave-bin.000001	#	Query	2	#	BEGIN
-slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)
-slave-bin.000001	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)
-slave-bin.000001	#	Write_rows	2	#	table_id: #
-slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Query	2	#	COMMIT
-slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB
-slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4
-show binlog events in 'slave-bin.000002' from 4;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
-slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB
-slave-bin.000002	#	Query	2	#	BEGIN
-slave-bin.000002	#	Table_map	2	#	table_id: # (test.t2)
-slave-bin.000002	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)
-slave-bin.000002	#	Write_rows	2	#	table_id: #
-slave-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-slave-bin.000002	#	Query	2	#	COMMIT
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000002
-Read_Master_Log_Pos	#
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000002
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	#
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Query	#	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
@@ -364,7 +260,6 @@ slave-bin.000002	#	Write_rows	#	#	table_
 slave-bin.000002	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 slave-bin.000002	#	Query	#	#	COMMIT
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
 DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result	2010-06-18 11:10:53 +0000
@@ -29,13 +29,8 @@ FROM mysql.ndb_binlog_index WHERE epoch 
 107	master-bin.000001
 CHANGE MASTER TO
 master_port=<MASTER_PORT1>,
-<<<<<<< TREE
-master_log_file = 'master-bin.000001',
-master_log_pos = 107 ;
-=======
 master_log_file = 'MASTER_LOG_FILE',
 master_log_pos = MASTER_LOG_POS ;
->>>>>>> MERGE-SOURCE
 start slave;
 INSERT INTO t1 VALUES ("row2","will go away",2),("row3","will change",3),("row4","D",4);
 DELETE FROM t1 WHERE c3 = 1;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result	2010-06-18 11:10:53 +0000
@@ -68,51 +68,7 @@ CHANGE MASTER TO
 master_log_file = 'master-bin.000001',
 master_log_pos = <the_pos> ;
 START SLAVE;
-<<<<<<< TREE
-SHOW SLAVE STATUS;
-Slave_IO_State	<Slave_IO_State>
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	<Read_Master_Log_Pos>
-Relay_Log_File	<Relay_Log_File>
-Relay_Log_Pos	<Relay_Log_Pos>
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	<Replicate_Ignore_Table>
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	<Exec_Master_Log_Pos>
-Relay_Log_Space	<Relay_Log_Space>
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	<Seconds_Behind_Master>
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	<Last_IO_Errno>
-Last_IO_Error	<Last_IO_Error>
-Last_SQL_Errno	0
-Last_SQL_Error	
-Replicate_Ignore_Server_Ids	
-Master_Server_Id	1
-=======
 Checking that both slave threads are running.
->>>>>>> MERGE-SOURCE
 SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3;
 hex(c1)	hex(c2)	c3
 1	1	row1

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result	2010-06-18 11:10:53 +0000
@@ -485,14 +485,7 @@ Comparing tables master:test.t1 and slav
 INSERT INTO t2 VALUES (1, "", 1);
 INSERT INTO t2 VALUES (2, repeat(_utf8'a', 16), 2);
 Comparing tables master:test.t2 and slave:test.t2
-<<<<<<< TREE
 SET GLOBAL SLAVE_TYPE_CONVERSIONS = @saved_slave_type_conversions;
-=======
-[expecting slave to stop]
-INSERT INTO t3 VALUES (1, "", 1);
-INSERT INTO t3 VALUES (2, repeat(_utf8'a', 128), 2);
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 384, test.t3 on slave has size 49. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
 RESET MASTER;
 STOP SLAVE;
 RESET SLAVE;
@@ -504,12 +497,7 @@ Comparing tables master:test.t4 and slav
 [expecting slave to stop]
 INSERT INTO t5 VALUES (1, "", 1);
 INSERT INTO t5 VALUES (2, repeat(_utf8'a', 255), 2);
-<<<<<<< TREE
-Last_SQL_Error
-Column 1 of table 'test.t5' cannot be converted from type 'char(255)' to type 'char(16)'
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t5 on slave has size 49. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 1 of table 'test.t5' cannot be converted from type 'char(255)' to type 'char(16)'
 RESET MASTER;
 STOP SLAVE;
 RESET SLAVE;
@@ -517,12 +505,7 @@ START SLAVE;
 [expecting slave to stop]
 INSERT INTO t6 VALUES (1, "", 1);
 INSERT INTO t6 VALUES (2, repeat(_utf8'a', 255), 2);
-<<<<<<< TREE
-Last_SQL_Error
-Column 1 of table 'test.t6' cannot be converted from type 'char(255)' to type 'char(128)'
-=======
-Last_SQL_Error = Table definition on master and slave does not match: Column 1 size mismatch - master has size 765, test.t6 on slave has size 385. Master's column size should be <= the slave's column size.
->>>>>>> MERGE-SOURCE
+Last_SQL_Error = Column 1 of table 'test.t6' cannot be converted from type 'char(255)' to type 'char(128)'
 RESET MASTER;
 STOP SLAVE;
 RESET SLAVE;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result	2010-06-18 11:10:53 +0000
@@ -29,18 +29,6 @@ a	b
 DROP TABLE t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001	107	Query	1	224	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001	224	Query	1	288	BEGIN
-master-bin.000001	288	Table_map	1	331	table_id: # (test.t1)
-master-bin.000001	331	Table_map	1	393	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	393	Write_rows	1	452	table_id: #
-master-bin.000001	452	Write_rows	1	499	table_id: # flags: STMT_END_F
-master-bin.000001	499	Query	1	564	COMMIT
-master-bin.000001	564	Query	1	644	use `test`; TRUNCATE TABLE t1
-master-bin.000001	644	Query	1	720	use `test`; DROP TABLE t1
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -50,7 +38,6 @@ master-bin.000001	#	Write_rows	#	#	table
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; TRUNCATE TABLE t1
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t1
->>>>>>> MERGE-SOURCE
 **** On Master ****
 CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
 INSERT INTO t1 VALUES (1,1), (2,2);
@@ -77,32 +64,6 @@ a	b
 DROP TABLE t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-<<<<<<< TREE
-master-bin.000001	4	Format_desc	1	107	Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001	107	Query	1	224	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001	224	Query	1	288	BEGIN
-master-bin.000001	288	Table_map	1	331	table_id: # (test.t1)
-master-bin.000001	331	Table_map	1	393	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	393	Write_rows	1	452	table_id: #
-master-bin.000001	452	Write_rows	1	499	table_id: # flags: STMT_END_F
-master-bin.000001	499	Query	1	564	COMMIT
-master-bin.000001	564	Query	1	644	use `test`; TRUNCATE TABLE t1
-master-bin.000001	644	Query	1	720	use `test`; DROP TABLE t1
-master-bin.000001	720	Query	1	837	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001	837	Query	1	901	BEGIN
-master-bin.000001	901	Table_map	1	944	table_id: # (test.t1)
-master-bin.000001	944	Table_map	1	1006	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	1006	Write_rows	1	1065	table_id: #
-master-bin.000001	1065	Write_rows	1	1112	table_id: # flags: STMT_END_F
-master-bin.000001	1112	Query	1	1177	COMMIT
-master-bin.000001	1177	Query	1	1241	BEGIN
-master-bin.000001	1241	Table_map	1	1284	table_id: # (test.t1)
-master-bin.000001	1284	Table_map	1	1346	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	1346	Write_rows	1	1405	table_id: #
-master-bin.000001	1405	Delete_rows	1	1444	table_id: # flags: STMT_END_F
-master-bin.000001	1444	Query	1	1509	COMMIT
-master-bin.000001	1509	Query	1	1585	use `test`; DROP TABLE t1
-=======
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
@@ -126,4 +87,3 @@ master-bin.000001	#	Write_rows	#	#	table
 master-bin.000001	#	Delete_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t1
->>>>>>> MERGE-SOURCE

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test	2010-06-17 14:52:42 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test	2010-06-18 11:10:53 +0000
@@ -194,10 +194,9 @@ connection slave;
 source include/wait_for_slave_sql_to_stop.inc;
 
 # Replication should have stopped, since max retries were not enough.
-# verify with show slave status 
+# verify with show slave status
 # 1205 = ER_LOCK_WAIT_TIMEOUT 
 --let $slave_sql_errno= 1205 
---let $show_slave_sql_error= 1 
 --source include/wait_for_slave_sql_error.inc
 
 # now set max retries high enough to succeed, and start slave again

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test	2010-03-03 17:26:38 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_binlog_format_errors.test	2010-06-18 11:10:53 +0000
@@ -111,7 +111,7 @@ INSERT INTO t_slave_stmt VALUES (1);
 --connection slave
 # 1645 = ER_BINLOG_ROW_INJECTION_AND_STMT_ENGINE
 --let $slave_sql_errno= 1645
---let $show_sql_error= 1
+--let $show_slave_sql_error= 1
 --source include/wait_for_slave_sql_error_and_skip.inc
 --connection slave
 SELECT * FROM t_slave_stmt /* should be empty */;

=== modified file 'mysql-test/t/multi_update.test'
--- a/mysql-test/t/multi_update.test	2010-05-24 13:54:08 +0000
+++ b/mysql-test/t/multi_update.test	2010-06-18 11:10:53 +0000
@@ -585,8 +585,7 @@ reset master;
 UPDATE t2,t1 SET t2.a=t1.a+2;
 # check
 select * from t2 /* must be (3,1), (4,4) */;
-let wait_binlog_event= UPDATE;
-source include/wait_for_binlog_event.inc;
+source include/show_binlog_events.inc;
 
 # B. testing multi_update::send_error() ineffective update
 # (as there is a policy described at mysql_update() still go to binlog)
@@ -597,8 +596,7 @@ insert into t2 values (1,2),(3,4),(4,4);
 reset master;
 --error ER_DUP_ENTRY
 UPDATE t2,t1  SET t2.a=t2.b where t2.a=t1.a;
-let wait_binlog_event= UPDATE;
-source include/wait_for_binlog_event.inc;
+source include/show_binlog_events.inc;
 
 # cleanup
 drop table t1, t2;


Attachment: [text/bzr-bundle] bzr/li-bing.song@sun.com-20100618111053-3j9rqt2c89fgsygp.bundle
Thread
bzr commit into mysql-5.1-rep+2 branch (Li-Bing.Song:3192) Bug#49741Li-Bing.Song18 Jun