summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-02-02 00:21:54 +0300
committerKonstantin Osipov <kostja@sun.com>2010-02-02 00:21:54 +0300
commit5eed6cc55db0f99aff7845397a824fb2f5ef069e (patch)
tree9cb6d2027d76dc8e860e1c3621f1e0a1c3683b07 /mysql-test
parent916fd68669de9dbd56a336e3ca1b92138befc857 (diff)
downloadmariadb-git-5eed6cc55db0f99aff7845397a824fb2f5ef069e.tar.gz
next-4284-merge: temporarily disable failing SSL tests.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/rpl/t/disabled.def3
-rw-r--r--mysql-test/t/disabled.def5
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
index 6bd4e7e833a..1278dce2c3f 100644
--- a/mysql-test/suite/rpl/t/disabled.def
+++ b/mysql-test/suite/rpl/t/disabled.def
@@ -14,3 +14,6 @@ rpl_cross_version : BUG#43913 2009-10-22 luis rpl_cross_version fa
rpl_spec_variables : BUG#47661 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
rpl_failed_optimize : WL#4284: Can't optimize table used by a pending transaction (there is metadata lock on the table).
rpl_read_only : WL#4284: Setting Read only won't succeed until all metadata locks are released.
+rpl_heartbeat_ssl : SSL certificates have expired.
+rpl_ssl : SSL certificates have expired.
+rpl_ssl1 : SSL certificates have expired.
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index ad7617b9403..b1baf6700c3 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -15,3 +15,8 @@ partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Inn
partition_innodb_plugin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
innodb-autoinc : Bug#48482 2009-11-02 svoj innodb-autoinc.test fails with results difference
rpl_killed_ddl : Bug#45520: rpl_killed_ddl fails sporadically in pb2
+openssl_1 : SSL certificates expired
+ssl : SSL certificates expired
+ssl_8k_key : SSL certificates expired
+ssl_compress : SSL certificates expired
+ssl_connect : SSL certificates expired