Commit 3d1658f7 authored Sep 12, 2005 by unknown

Adding comment for force manual merge 5.0 -> wl1012

parent 3462573f

mysql-test/t/rpl_error_ignored_table.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,3 +57,4 @@ connection slave;
		sync_with_master;

		# End of 4.1 tests
		# Adding comment for force manual merge 5.0 -> wl1012. delete me if needed

mysql-test/t/rpl_flush_tables.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,3 +40,4 @@ select * from t3;
		# in the .err files; these are not fatal and are not reported by mysql-test-run.

		# End of 4.1 tests
		# Adding comment for force manual merge 5.0 -> wl1012. Delete me if needed.

mysql-test/t/rpl_loaddata_rule_m.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,3 +27,4 @@ show binlog events from 98;
		drop database mysqltest;

		# End of 4.1 tests
		# Adding comment for force manual merge 5.0 -> wl1012: Delete me

mysql-test/t/rpl_log.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -110,3 +110,4 @@ show slave status;
		show binlog events in 'slave-bin.000005' from 4;

		# End of 4.1 tests
		# Adding comment for force manual merge 5.0 -> wl1012: Delete me

mysql-test/t/rpl_max_relay_size.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,3 +93,4 @@ flush logs;
		show master status;

		# End of 4.1 tests
		#