summaryrefslogtreecommitdiff
path: root/mysql-test/collections
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@sun.com>2010-02-05 08:10:20 -0700
committerMarc Alff <marc.alff@sun.com>2010-02-05 08:10:20 -0700
commitae7615c091ace209a37edc61b798438c985d4111 (patch)
treea28f45453cf3f630c23aab8f7672ad781028244a /mysql-test/collections
parent672ad28b2bf8f35c00fbc66ba21493e7af7870d5 (diff)
parentf53d591e9f11c8ff8a186c1e764bed17f1f5a7b8 (diff)
downloadmariadb-git-ae7615c091ace209a37edc61b798438c985d4111.tar.gz
Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marc
Diffstat (limited to 'mysql-test/collections')
-rw-r--r--mysql-test/collections/default.experimental3
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental
index 2231bc7c3af..c538d299553 100644
--- a/mysql-test/collections/default.experimental
+++ b/mysql-test/collections/default.experimental
@@ -11,12 +11,11 @@ main.information_schema # Bug#47449 2009-09-19 alik main.inform
main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
main.lock_multi_bug38691 @solaris # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10
main.log_tables # Bug#47924 2009-10-08 alik main.log_tables times out sporadically
-main.outfile_loaddata @solaris # bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
+main.outfile_loaddata @solaris # Bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
main.plugin # Bug#47146 Linking problem with example plugin when dtrace enabled
main.signal_demo3 @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
main.sp @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-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