From 8305cb472c5b4d926e4eea1bcb447b2e79307afb Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Jul 16 2016 19:45:33 +0000
Subject: Merge branch 'master' into f24


---

diff --git a/mariadb.spec b/mariadb.spec
index 4f23a8c..09c1be8 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -941,10 +941,6 @@ export MTR_BUILD_THREAD=%{__isa_bits}
     || :
 %else
     --skip-test-list=rh-skipped-tests.list
-
-    # from unknown reasons ssl tests fail when run as part of whole
-    # test-suite, but pass when running separately, so do it:
-    perl ./mysql-test-run.pl --ssl --do-test=ssl
 %endif
   # cmake build scripts will install the var cruft if left alone :-(
   rm -rf var