Commit b6d6062d authored by Magnus Svensson's avatar Magnus Svensson
Browse files

Merge

parents 5b8771ea 7a6cac5f

mysql-test/extra/rpl_tests/rpl_log.test

+2 −6
Original line number Diff line number Diff line
@@ -70,11 +70,7 @@ eval create table t3 (a int)ENGINE=$engine_type; 
connection master;

select * from t1 order by 1 asc;



save_master_pos;

connection slave;

source include/start_slave.inc;



sync_with_master;

sync_slave_with_master;

#check t1 on slave to ensure whether it's identical with on master

select * from t1 order by 1 asc;

flush logs;
@@ -142,4 +138,4 @@ drop table t1; 
# End of 4.1 tests



sync_slave_with_master;

drop table t1;

mysql-test/suite/rpl/r/rpl_misc_functions.result

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ set sql_log_bin=1; 
insert into t1 values(3, 0, 0, 0, password('does_this_work?'));

insert into t1 values(4, connection_id(), rand()*1000, rand()*1000, password('does_this_still_work?'));

select * into outfile 'rpl_misc_functions.outfile' from t1;

create table t2 like t1;

create temporary table t2 like t1;

load data local infile 'MYSQLD_DATADIR/test/rpl_misc_functions.outfile' into table t2;

select * from t1, t2 where (t1.id=t2.id) and not(t1.i=t2.i and t1.r1=t2.r1 and t1.r2=t2.r2 and t1.p=t2.p);

id	i	r1	r2	p	id	i	r1	r2	p

mysql-test/suite/rpl/r/rpl_row_log.result

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ Aberdeen 
Abernathy

aberrant

aberration

include/start_slave.inc

select * from t1 order by 1 asc;

word

Aarhus
@@ -306,3 +305,4 @@ a b 
5	1

6	1

drop table t1;

drop table t1;

mysql-test/suite/rpl/r/rpl_row_log_innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ Aberdeen 
Abernathy

aberrant

aberration

include/start_slave.inc

select * from t1 order by 1 asc;

word

Aarhus
@@ -306,3 +305,4 @@ a b 
5	1

6	1

drop table t1;

drop table t1;

mysql-test/suite/rpl/r/rpl_stm_log.result

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ Aberdeen 
Abernathy

aberrant

aberration

include/start_slave.inc

select * from t1 order by 1 asc;

word

Aarhus
@@ -287,3 +286,4 @@ a b 
5	1

6	1

drop table t1;

drop table t1;