Merge branch 'master' into f24

This commit is contained in:
Honza Horak 2016-07-16 21:45:33 +02:00
commit 8305cb472c

View File

@ -941,10 +941,6 @@ export MTR_BUILD_THREAD=%{__isa_bits}
|| : || :
%else %else
--skip-test-list=rh-skipped-tests.list --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 %endif
# cmake build scripts will install the var cruft if left alone :-( # cmake build scripts will install the var cruft if left alone :-(
rm -rf var rm -rf var