diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-31 00:26:38 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-31 00:26:38 +0300 |
| commit | 417e13847034db2a829c4f9809cd6f284b3652fb (patch) | |
| tree | 47cd0f017d8fe7dc11238110ab3745bdc9179272 /mysql-test/collections | |
| parent | 27b957a38fbd78db4e6b09799396284cf4a5a10e (diff) | |
| parent | b55d41cb6a960980ea6ce07a68b0745287dc1b6b (diff) | |
| download | mariadb-git-417e13847034db2a829c4f9809cd6f284b3652fb.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
- mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Diffstat (limited to 'mysql-test/collections')
| -rw-r--r-- | mysql-test/collections/default.experimental | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index f23de57b975..e62c88db5cb 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -19,7 +19,6 @@ main.sp @solaris # Bug#47791 2010-01-20 alik Several tes perfschema.tampered_perfschema_table1 @windows # Bug#50478 2010-01-20 alik perfschema.tampered_perfschema_table1 fails sporadically on Windows and Solaris perfschema.tampered_perfschema_table1 @solaris # Bug#50478 2010-01-20 alik perfschema.tampered_perfschema_table1 fails sporadically on Windows and Solaris -rpl.rpl_get_master_version_and_clock* # Bug#49191 2009-12-01 Daogang rpl_get_master_version_and_clock failed on PB2: COM_REGISTER_SLAVE failed rpl.rpl_heartbeat_basic # BUG#43828 2009-10-22 luis fails sporadically rpl.rpl_heartbeat_2slaves # BUG#43828 2009-10-22 luis fails sporadically rpl.rpl_innodb_bug28430* # Bug#46029 |