diff options
| author | unknown <jmiller@mysql.com> | 2005-09-12 22:47:15 +0200 |
|---|---|---|
| committer | unknown <jmiller@mysql.com> | 2005-09-12 22:47:15 +0200 |
| commit | ddaad4c265d1333d105aadba8a895d545a2fd61f (patch) | |
| tree | d0cc3389e01b6382b30dddea2b66443a895607fd | |
| parent | b606170d2c7ea0cb23a20297482ea71422ce2e0d (diff) | |
| download | mariadb-git-ddaad4c265d1333d105aadba8a895d545a2fd61f.tar.gz | |
Adding comment for force manual merge 5.0 -> wl1012
| -rw-r--r-- | mysql-test/t/rpl_error_ignored_table.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_flush_tables.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_loaddata_rule_m.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_log.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_max_relay_size.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_multi_query.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_reset_slave.test | 1 |
7 files changed, 7 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 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. diff --git a/mysql-test/t/rpl_loaddata_rule_m.test b/mysql-test/t/rpl_loaddata_rule_m.test index 68024c340a8..c956f2c7720 100644 --- a/mysql-test/t/rpl_loaddata_rule_m.test +++ b/mysql-test/t/rpl_loaddata_rule_m.test @@ -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 diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test index 899f812535a..1f71d2981c5 100644 --- a/mysql-test/t/rpl_log.test +++ b/mysql-test/t/rpl_log.test @@ -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 diff --git a/mysql-test/t/rpl_max_relay_size.test b/mysql-test/t/rpl_max_relay_size.test index 8b54cf5ab7f..9b6b06e0b14 100644 --- a/mysql-test/t/rpl_max_relay_size.test +++ b/mysql-test/t/rpl_max_relay_size.test @@ -93,3 +93,4 @@ flush logs; show master status; # End of 4.1 tests +# diff --git a/mysql-test/t/rpl_multi_query.test b/mysql-test/t/rpl_multi_query.test index fa94928e13a..b4cd88f756e 100644 --- a/mysql-test/t/rpl_multi_query.test +++ b/mysql-test/t/rpl_multi_query.test @@ -29,3 +29,4 @@ drop database mysqltest; sync_slave_with_master; # End of 4.1 tests +# diff --git a/mysql-test/t/rpl_reset_slave.test b/mysql-test/t/rpl_reset_slave.test index aeac1b50110..00b1cf68294 100644 --- a/mysql-test/t/rpl_reset_slave.test +++ b/mysql-test/t/rpl_reset_slave.test @@ -48,3 +48,4 @@ sync_with_master; show status like 'slave_open_temp_tables'; # End of 4.1 tests +# |