diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-12-21 13:23:41 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-12-21 13:23:41 +0300 |
| commit | a13f2adddcccc25c3c63b669ed5070375b13abf6 (patch) | |
| tree | a0f74e5adf66dedea1a955cf70b6ffc000d2b568 /mysql-test | |
| parent | 22c65346986d63c906e1d5a57941cadc367c2a9f (diff) | |
| parent | c736665e43995327cae3ea417c8abc815ea925fc (diff) | |
| download | mariadb-git-a13f2adddcccc25c3c63b669ed5070375b13abf6.tar.gz | |
Auto-merge from mysql-trunk-bugfixing.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/collections/default.experimental | 1 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index 7f5faa23c1b..52422f5d140 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -12,7 +12,6 @@ main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_m 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.plugin # Bug#47146 Linking problem with example plugin when dtrace enabled -main.plugin_load # Bug#47146 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 diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 3d9dc72ee45..97237d5da73 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -13,3 +13,4 @@ kill : Bug#37780 2008-12-03 HHunger need some changes to be query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadicallyr innodb-autoinc : Bug#49267 2009-12-02 test fails on windows because of different case mode innodb : Bug#49396 2009-12-03 test fails in embedded mode +plugin_load : Bug#42144 2009-12-21 alik plugin_load fails |