Merge branch 'master' into f24

2016-07-16 21:45:33 +02:00 · 2016-07-16 21:45:33 +02:00 · 8305cb472c
parent 23e13425d2 4e699cec52
commit 8305cb472c
1 changed files with 0 additions and 4 deletions
--- 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