mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
Adding comment for force manual merge 5.0 -> wl1012
This commit is contained in:
parent
3462573fa8
commit
3d1658f713
7 changed files with 7 additions and 0 deletions
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -93,3 +93,4 @@ flush logs;
|
|||
show master status;
|
||||
|
||||
# End of 4.1 tests
|
||||
#
|
||||
|
|
|
@ -29,3 +29,4 @@ drop database mysqltest;
|
|||
sync_slave_with_master;
|
||||
|
||||
# End of 4.1 tests
|
||||
#
|
||||
|
|
|
@ -48,3 +48,4 @@ sync_with_master;
|
|||
show status like 'slave_open_temp_tables';
|
||||
|
||||
# End of 4.1 tests
|
||||
#
|
||||
|
|
Loading…
Reference in a new issue