Commit 3d1658f7 authored by unknown's avatar unknown

Adding comment for force manual merge 5.0 -> wl1012

parent 3462573f
...@@ -57,3 +57,4 @@ connection slave; ...@@ -57,3 +57,4 @@ connection slave;
sync_with_master; sync_with_master;
# End of 4.1 tests # End of 4.1 tests
# Adding comment for force manual merge 5.0 -> wl1012. delete me if needed
...@@ -40,3 +40,4 @@ select * from t3; ...@@ -40,3 +40,4 @@ select * from t3;
# in the .err files; these are not fatal and are not reported by mysql-test-run. # in the .err files; these are not fatal and are not reported by mysql-test-run.
# End of 4.1 tests # End of 4.1 tests
# Adding comment for force manual merge 5.0 -> wl1012. Delete me if needed.
...@@ -27,3 +27,4 @@ show binlog events from 98; ...@@ -27,3 +27,4 @@ show binlog events from 98;
drop database mysqltest; drop database mysqltest;
# End of 4.1 tests # End of 4.1 tests
# Adding comment for force manual merge 5.0 -> wl1012: Delete me
...@@ -110,3 +110,4 @@ show slave status; ...@@ -110,3 +110,4 @@ show slave status;
show binlog events in 'slave-bin.000005' from 4; show binlog events in 'slave-bin.000005' from 4;
# End of 4.1 tests # End of 4.1 tests
# Adding comment for force manual merge 5.0 -> wl1012: Delete me
...@@ -93,3 +93,4 @@ flush logs; ...@@ -93,3 +93,4 @@ flush logs;
show master status; show master status;
# End of 4.1 tests # End of 4.1 tests
#
...@@ -29,3 +29,4 @@ drop database mysqltest; ...@@ -29,3 +29,4 @@ drop database mysqltest;
sync_slave_with_master; sync_slave_with_master;
# End of 4.1 tests # End of 4.1 tests
#
...@@ -48,3 +48,4 @@ sync_with_master; ...@@ -48,3 +48,4 @@ sync_with_master;
show status like 'slave_open_temp_tables'; show status like 'slave_open_temp_tables';
# End of 4.1 tests # End of 4.1 tests
#
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment