Revert "Update to 10.1.15"
This reverts commit 72a82b67ae.
I can't remember, where I found it, but 10.1.15 was never released.
This commit is contained in:
Jakub Dorňák
parent
72a82b67ae
commit
7b4b19c581
@ -1,20 +0,0 @@
|
||||
--- mariadb-10.1.15/mysql-test/t/openssl_1.test.orig 2016-06-29 22:56:09.000000000 +0200
|
||||
+++ mariadb-10.1.15/mysql-test/t/openssl_1.test 2016-07-04 10:47:13.366522457 +0200
|
||||
@@ -134,7 +134,7 @@ drop table t1;
|
||||
# verification of servers certificate by setting both ca certificate
|
||||
# and ca path to NULL
|
||||
#
|
||||
---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||||
+--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||||
--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
|
||||
--echo End of 5.0 tests
|
||||
|
||||
@@ -259,7 +259,7 @@ select 'is still running; no cipher requ
|
||||
GRANT SELECT ON test.* TO bug42158@localhost REQUIRE X509;
|
||||
FLUSH PRIVILEGES;
|
||||
connect(con1,localhost,bug42158,,,,,SSL);
|
||||
---replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA
|
||||
+--replace_result DHE-RSA-AES256-GCM-SHA384 DHE-RSA-AES256-SHA DHE-RSA-CHACHA20-POLY1305 DHE-RSA-AES256-SHA AES256-GCM-SHA384 DHE-RSA-AES256-SHA
|
||||
SHOW STATUS LIKE 'Ssl_cipher';
|
||||
disconnect con1;
|
||||
connection default;
|
||||
14
mariadb.spec
14
mariadb.spec
@ -8,7 +8,7 @@
|
||||
%{!?runselftest:%global runselftest 1}
|
||||
|
||||
# Set this to 1 to see which tests fail
|
||||
%global check_testsuite 0
|
||||
%global check_testsuite 1
|
||||
|
||||
# In f20+ use unversioned docdirs, otherwise the old versioned one
|
||||
%global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}}
|
||||
@ -119,11 +119,11 @@
|
||||
# Make long macros shorter
|
||||
%global sameevr %{epoch}:%{version}-%{release}
|
||||
%global compatver 10.1
|
||||
%global bugfixver 15
|
||||
%global bugfixver 14
|
||||
|
||||
Name: mariadb
|
||||
Version: %{compatver}.%{bugfixver}
|
||||
Release: 1%{?with_debug:.debug}%{?dist}
|
||||
Release: 2%{?with_debug:.debug}%{?dist}
|
||||
Epoch: 1
|
||||
|
||||
Summary: A community developed branch of MySQL
|
||||
@ -163,7 +163,6 @@ Source72: mariadb-server-galera.te
|
||||
# Patches common for more mysql-like packages
|
||||
Patch1: %{pkgnamepatch}-strmov.patch
|
||||
Patch2: %{pkgnamepatch}-install-test.patch
|
||||
Patch3: %{pkgnamepatch}-test-openssl_1.patch
|
||||
Patch4: %{pkgnamepatch}-logrotate.patch
|
||||
Patch5: %{pkgnamepatch}-file-contents.patch
|
||||
Patch7: %{pkgnamepatch}-scripts.patch
|
||||
@ -548,7 +547,6 @@ MariaDB is a community developed branch of MySQL.
|
||||
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch7 -p1
|
||||
@ -1099,9 +1097,8 @@ fi
|
||||
%files server-galera
|
||||
%doc Docs/README.wsrep
|
||||
%license LICENSE.clustercheck
|
||||
%{_bindir}/clustercheck
|
||||
%{_bindir}/galera_new_cluster
|
||||
%{_bindir}/galera_recovery
|
||||
%{_bindir}/clustercheck
|
||||
%{_datadir}/%{pkg_name}/systemd/use_galera_new_cluster.conf
|
||||
%config(noreplace) %{_sysconfdir}/my.cnf.d/galera.cnf
|
||||
%attr(0640,root,root) %ghost %config(noreplace) %{_sysconfdir}/sysconfig/clustercheck
|
||||
@ -1287,9 +1284,6 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jul 1 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.15-1
|
||||
- Update to 10.1.15
|
||||
|
||||
* Thu May 26 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.14-2
|
||||
- Fix mysql-prepare-db-dir
|
||||
Resolves: #1335849
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
main.analyze_format_json : rhbz#1096787
|
||||
main.analyze_stmt_orderby : rhbz#1096787
|
||||
main.explain_json : rhbz#1096787
|
||||
main.explain_json_format_partitions : rhbz#1096787
|
||||
main.explain_json_innodb : rhbz#1096787
|
||||
|
||||
connect.bin : rhbz#1096787 (pass on aarch64)
|
||||
connect.endian : rhbz#1096787
|
||||
|
||||
main.partition_exchange : rhbz#1096787
|
||||
main.analyze_stmt_orderby : rhbz#1096787
|
||||
main.explain_json_innodb : rhbz#1096787
|
||||
main.explain_json_format_partitions : rhbz#1096787
|
||||
main.analyze_format_json : rhbz#1096787
|
||||
main.explain_json : rhbz#1096787
|
||||
main.subselect_cache : rhbz#1096787
|
||||
main.type_year : rhbz#1096787
|
||||
|
||||
@ -1,15 +1,14 @@
|
||||
# These tests fail with MariaDB 10:
|
||||
main.multi_update : rhbz#1096787
|
||||
main.set_statement_notembedded_binlog : rhbz#1096787
|
||||
main.ssl : rhbz#1096787
|
||||
main.ssl_ca : rhbz#1096787
|
||||
main.ssl_cert_verify : rhbz#1096787
|
||||
main.ssl_compress : rhbz#1096787
|
||||
main.ssl_crl_clients : rhbz#1096787
|
||||
main.ssl_timeout : rhbz#1096787
|
||||
main.ssl_7937 : rhbz#1096787
|
||||
main.ssl_8k_key : rhbz#1096787
|
||||
|
||||
main.userstat : rhbz#1096787
|
||||
main.set_statement_notembedded_binlog : rhbz#1096787
|
||||
main.ssl_7937 : rhbz#1096787
|
||||
main.ssl_crl_clients : rhbz#1096787
|
||||
main.openssl_1 : rhbz#1096787
|
||||
main.ssl : rhbz#1096787
|
||||
main.ssl_8k_key : rhbz#1096787
|
||||
main.ssl_compress : rhbz#1096787
|
||||
main.ssl_timeout : rhbz#1096787
|
||||
perfschema.nesting : rhbz#1096787
|
||||
perfschema.socket_summary_by_event_name_func : rhbz#1096787
|
||||
perfschema.socket_summary_by_instance_func : rhbz#1096787
|
||||
|
||||
Loading…
Reference in New Issue
Block a user