Commit c8574b77 authored Oct 07, 2008 by Mats Kindahl

Post-merge fixes.

parent b3b8274e

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_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;

mysql-test/suite/rpl/t/rpl_binlog_query_filter_rules.test

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,8 +16,9 @@ reset master;
		create table t1 (a int);
		insert into t1 values (1);

		let $MYSQLD_DATADIR= `select @@datadir`;
		flush logs;
		--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug36099.sql
		--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/bug36099.sql

		drop table t1;
		--exec $MYSQL -e "source $MYSQLTEST_VARDIR/tmp/bug36099.sql"