Commit 6a278824 authored by unknown's avatar unknown
Browse files

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
parents 5be20e1c fdedc069

mysql-test/extra/rpl_tests/rpl_log.test

+1 −5
Original line number Diff line number Diff line
@@ -77,12 +77,8 @@ connection slave; 
# to go into the relay log (the master always sends a fake one when replication

# starts). 

start slave;

--disable_query_log

--disable_result_log

let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000007%Yes%Yes%0%0%None%';

let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%';

--source include/wait_slave_status.inc

--enable_query_log

--enable_result_log

sync_with_master;

flush logs;

stop slave;

mysql-test/r/rpl_row_log.result

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F 
flush logs;

create table t3 (a int)ENGINE=MyISAM;

start slave;



let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;



--source include/wait_slave_status.inc

flush logs;

stop slave;

create table t2 (n int)ENGINE=MyISAM;

mysql-test/r/rpl_row_log_innodb.result

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F 
flush logs;

create table t3 (a int)ENGINE=InnoDB;

start slave;



let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;



--source include/wait_slave_status.inc

flush logs;

stop slave;

create table t2 (n int)ENGINE=InnoDB;

mysql-test/r/rpl_stm_log.result

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ master-bin.000001 # Query 1 # use `test`; insert into t1 values (NULL) 
flush logs;

create table t3 (a int)ENGINE=MyISAM;

start slave;



let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;



--source include/wait_slave_status.inc

flush logs;

stop slave;

create table t2 (n int)ENGINE=MyISAM;