diff options
author | Alexander Nozdrin <alik@sun.com> | 2009-10-22 22:06:01 +0400 |
---|---|---|
committer | Alexander Nozdrin <alik@sun.com> | 2009-10-22 22:06:01 +0400 |
commit | 564952afb01fa9ff1d6f4622c0f4fb35ccc037cb (patch) | |
tree | 85bcbfa3559990f90ce21638ed46531ed888aaa3 /mysql-test/suite/rpl/t/disabled.def | |
parent | ffde6bbb15b75c94293784fa0f4264d64039f0b9 (diff) | |
parent | bcaa7524d935464c68e34cb0657cd43517108c40 (diff) | |
download | mariadb-git-564952afb01fa9ff1d6f4622c0f4fb35ccc037cb.tar.gz |
Automerge from mysql-next-mr.
Diffstat (limited to 'mysql-test/suite/rpl/t/disabled.def')
-rw-r--r-- | mysql-test/suite/rpl/t/disabled.def | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index 85747264b6f..3e3069d5d92 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -10,4 +10,4 @@ # ############################################################################## -rpl_cross_version : Bug#43913 2009-03-27 joro rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm +rpl_get_master_version_and_clock: # Bug#46931 2009-10-17 joro rpl.rpl_get_master_version_and_clock fails |