database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Adding comment for force manual merge 5.0 -> wl1012

Browse Source
This commit is contained in:
jmiller@mysql.com
2005-09-12 22:47:15 +02:00
parent d0f585f11f
commit 9f573f0ac8
7 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/t/rpl_error_ignored_table.test
View File

@ -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

1
mysql-test/t/rpl_flush_tables.test
View File

@ -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.

1
mysql-test/t/rpl_loaddata_rule_m.test
View File

@ -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

1
mysql-test/t/rpl_log.test
View File

@ -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

1
mysql-test/t/rpl_max_relay_size.test
View File

@ -93,3 +93,4 @@ flush logs;
show master status; show master status;
# End of 4.1 tests # End of 4.1 tests
#

1
mysql-test/t/rpl_multi_query.test
View File

@ -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
#

1
mysql-test/t/rpl_reset_slave.test
View File

@ -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
#