summaryrefslogtreecommitdiff
path: root/mysql-test/t/rpl_flush_tables.test
diff options
context:
space:
mode:
authorunknown <jmiller@mysql.com>2005-09-12 22:47:15 +0200
committerunknown <jmiller@mysql.com>2005-09-12 22:47:15 +0200
commitddaad4c265d1333d105aadba8a895d545a2fd61f (patch)
treed0cc3389e01b6382b30dddea2b66443a895607fd /mysql-test/t/rpl_flush_tables.test
parentb606170d2c7ea0cb23a20297482ea71422ce2e0d (diff)
downloadmariadb-git-ddaad4c265d1333d105aadba8a895d545a2fd61f.tar.gz
Adding comment for force manual merge 5.0 -> wl1012
Diffstat (limited to 'mysql-test/t/rpl_flush_tables.test')
-rw-r--r--mysql-test/t/rpl_flush_tables.test1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/rpl_flush_tables.test b/mysql-test/t/rpl_flush_tables.test
index 48fda818890..4411d6ea1c9 100644
--- a/mysql-test/t/rpl_flush_tables.test
+++ b/mysql-test/t/rpl_flush_tables.test
@@ -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.