summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl_error_ignored_table.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t/rpl_error_ignored_table.test')
-rw-r--r--mysql-test/t/rpl_error_ignored_table.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/rpl_error_ignored_table.test b/mysql-test/t/rpl_error_ignored_table.test
index a854c3621ab..cb4137c49e0 100644
--- a/mysql-test/t/rpl_error_ignored_table.test
+++ b/mysql-test/t/rpl_error_ignored_table.test
@@ -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