From bc9a74f66d3d82c86d1ff740b60d03c6e7daf17a7cfc0be31238cb3f42bf8bd0 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Mon, 5 Aug 2019 11:31:30 +0000 Subject: [PATCH] Accepting request 720706 from home:kstreitova:branches:server:database - update to 10.3.17 [bsc#1141798] * notable changes: * MDEV-19795: Merge upstream MyRocks. * MDEV-17228: Encrypted temporary tables are not encrypted. * MDEV-18328: Disks Plugin is now stable and requires the FILE privilege. * Merge relevant InnoDB changes from MySQL 5.7.27 * Adjust spin loops to the x86 PAUSE instruction latency * CREATE TABLE: MDEV-19292, MDEV-20102 * ALTER TABLE: MDEV-15641, MDEV-19630, MDEV-19916, MDEV-19974 * Indexed virtual columns: MDEV-16222, MDEV-17005, MDEV-19870 * FULLTEXT INDEX: MDEV-14154 * Encryption: MDEV-17228, MDEV-19914 * Galera + FOREIGN KEY: MDEV-19660 * Recovery & Mariabackup: MDEV-19978 * MDEV-19781: Add page id matching check in innochecksum tool * MDEV-20091: DROP TEMPORARY table is logged despite no CREATE was logged * MDEV-19427: mysql_upgrade_service throws exception upgrading from 10.0 to 10.3 * MDEV-19814: Server crash in row_upd_del_mark_clust_rec or Assertion * MDEV-17363: Compressed columns cannot be restored from dump * fixes for the following security vulnerabilities: CVE-2019-2805, CVE-2019-2740, CVE-2019-2739, CVE-2019-2737, CVE-2019-2758 * release notes and changelog: https://mariadb.com/kb/en/library/mariadb-10317-release-notes https://mariadb.com/kb/en/library/mariadb-10317-changelog - add "BuildRequires: python3" as some tests and myrocks_hotbackup OBS-URL: https://build.opensuse.org/request/show/720706 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=235 --- mariadb-10.2.9-galera_cnf.patch | 29 ---------------------- mariadb-10.3.16.tar.gz | 3 --- mariadb-10.3.16.tar.gz.sig | 7 ------ mariadb-10.3.17.tar.gz | 3 +++ mariadb-10.3.17.tar.gz.sig | 7 ++++++ mariadb.changes | 44 +++++++++++++++++++++++++++++++++ mariadb.spec | 15 ++++++++--- my.ini | 6 ----- 8 files changed, 66 insertions(+), 48 deletions(-) delete mode 100644 mariadb-10.2.9-galera_cnf.patch delete mode 100644 mariadb-10.3.16.tar.gz delete mode 100644 mariadb-10.3.16.tar.gz.sig create mode 100644 mariadb-10.3.17.tar.gz create mode 100644 mariadb-10.3.17.tar.gz.sig diff --git a/mariadb-10.2.9-galera_cnf.patch b/mariadb-10.2.9-galera_cnf.patch deleted file mode 100644 index 49c5c73..0000000 --- a/mariadb-10.2.9-galera_cnf.patch +++ /dev/null @@ -1,29 +0,0 @@ -PATCH-P1-FIX-FEATURE: Enhance wsrep.cnf (galera configuration file) - -wsrep_on option defines whether or not wsrep replication is enabled. -It's set to OFF by default since MariaDB 10.1 but we want to mention -this option explicitly in galera configuration file in order to bring -it to the user's attention. - -Set the location of the wsrep library (wsrep_provider option). - -Maintainer: Kristyna Streitova - - -Index: mariadb-10.2.16/support-files/wsrep.cnf.sh -=================================================================== ---- mariadb-10.2.16.orig/support-files/wsrep.cnf.sh -+++ mariadb-10.2.16/support-files/wsrep.cnf.sh -@@ -31,10 +31,10 @@ bind-address=0.0.0.0 - ## - - # Enable wsrep --wsrep_on=1 -+wsrep_on=OFF - - # Full path to wsrep provider library or 'none' --wsrep_provider=none -+wsrep_provider=%{_libdir}/galera/libgalera_smm.so - - # Provider specific configuration options - #wsrep_provider_options= diff --git a/mariadb-10.3.16.tar.gz b/mariadb-10.3.16.tar.gz deleted file mode 100644 index 4d91d13..0000000 --- a/mariadb-10.3.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39e9723eaf620afd99b0925b2c2a5a50a89110ba50040adf14cce7cf89e5e21b -size 70862041 diff --git a/mariadb-10.3.16.tar.gz.sig b/mariadb-10.3.16.tar.gz.sig deleted file mode 100644 index d245a3b..0000000 --- a/mariadb-10.3.16.tar.gz.sig +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEABECAAYFAl0FZ48ACgkQy8sIKhu5Q9vcXACg8sQUJsDG5/w3imoZRFO/HE5n -HLkAoImxeypRbyxgvixOG7Fog7HlxrQP -=3e24 ------END PGP SIGNATURE----- diff --git a/mariadb-10.3.17.tar.gz b/mariadb-10.3.17.tar.gz new file mode 100644 index 0000000..8420f7b --- /dev/null +++ b/mariadb-10.3.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20a1ea4fc59aae89dcc82aff0d4907b036daf9bfbd252f08162399f055097097 +size 71894997 diff --git a/mariadb-10.3.17.tar.gz.sig b/mariadb-10.3.17.tar.gz.sig new file mode 100644 index 0000000..b380f58 --- /dev/null +++ b/mariadb-10.3.17.tar.gz.sig @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEABECAAYFAl0/HkcACgkQy8sIKhu5Q9vPzgCggjXcddbYnPocg832L8RQpUnY +Op8AnRuT0lFduvcNZluz44/u8vFS2IIq +=9tGf +-----END PGP SIGNATURE----- diff --git a/mariadb.changes b/mariadb.changes index 02272cd..5114b87 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Fri Aug 2 10:32:48 UTC 2019 - Kristyna Streitova + +- update to 10.3.17 [bsc#1141798] + * notable changes: + * MDEV-19795: Merge upstream MyRocks. + * MDEV-17228: Encrypted temporary tables are not encrypted. + * MDEV-18328: Disks Plugin is now stable and requires the FILE + privilege. + * Merge relevant InnoDB changes from MySQL 5.7.27 + * Adjust spin loops to the x86 PAUSE instruction latency + * CREATE TABLE: MDEV-19292, MDEV-20102 + * ALTER TABLE: MDEV-15641, MDEV-19630, MDEV-19916, MDEV-19974 + * Indexed virtual columns: MDEV-16222, MDEV-17005, MDEV-19870 + * FULLTEXT INDEX: MDEV-14154 + * Encryption: MDEV-17228, MDEV-19914 + * Galera + FOREIGN KEY: MDEV-19660 + * Recovery & Mariabackup: MDEV-19978 + * MDEV-19781: Add page id matching check in innochecksum tool + * MDEV-20091: DROP TEMPORARY table is logged despite no CREATE + was logged + * MDEV-19427: mysql_upgrade_service throws exception upgrading + from 10.0 to 10.3 + * MDEV-19814: Server crash in row_upd_del_mark_clust_rec or + Assertion + * MDEV-17363: Compressed columns cannot be restored from dump + * fixes for the following security vulnerabilities: + CVE-2019-2805, CVE-2019-2740, CVE-2019-2739, CVE-2019-2737, + CVE-2019-2758 + * release notes and changelog: + https://mariadb.com/kb/en/library/mariadb-10317-release-notes + https://mariadb.com/kb/en/library/mariadb-10317-changelog +- add "BuildRequires: python3" as some tests and myrocks_hotbackup + script need python3. Make the PYTHON_SHEBANG value configurable + [bsc#1142909] +- remove "innodb_file_format" option from my.ini (my.cnf) file that + was removed in MariaDB 10.3.1. Also remove "innodb_file_per_table=ON" + option that is by default ON and it's redundant now. +- remove mariadb-10.2.9-galera_cnf.patch as it's not clear what the + correct path to galera wsrep provider is while users can use + galera 3, galera 4 or galera compiled on their own +- add "Requires: python3-mysqlclient" that is needed by + myrocks_hotbackup script + ------------------------------------------------------------------- Fri Aug 2 08:14:49 UTC 2019 - Martin Liška diff --git a/mariadb.spec b/mariadb.spec index cd8f1d4..c4da4c7 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -47,8 +47,14 @@ %define with_mroonga 0 %define with_rocksdb 0 %endif +# Define python interpreter version +%if 0%{?suse_version} >= 1500 +%define python_path /usr/bin/python3 +%else +%define python_path /usr/bin/python2 +%endif Name: mariadb -Version: 10.3.16 +Version: 10.3.17 Release: 0 Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception @@ -71,7 +77,6 @@ Patch3: mariadb-10.1.1-mysqld_multi-features.patch Patch7: mariadb-10.0.15-logrotate-su.patch Patch8: mariadb-10.2.4-fortify-and-O.patch Patch9: mariadb-10.2.19-link-and-enable-c++11-atomics.patch -Patch11: mariadb-10.2.9-galera_cnf.patch # needed for bison SQL parser and wsrep API BuildRequires: bison BuildRequires: cmake @@ -101,6 +106,8 @@ BuildRequires: pam-devel BuildRequires: pcre-devel BuildRequires: pkgconfig BuildRequires: procps +# Some tests and myrocks_hotbackup script need python3 +BuildRequires: python3 BuildRequires: shadow BuildRequires: sqlite BuildRequires: tcpd-devel @@ -131,6 +138,8 @@ Requires: %{name}-errormessages = %{version} # It can be switched back to plain "hostname" when this bug is resolved Requires: /bin/hostname Requires: perl-base +# myrocks_hotbackup needs MySQLdb - if we want to use it under python3, we need python3-mysqlclient +Requires: python3-mysqlclient Requires(pre): shadow Recommends: logrotate Conflicts: mariadb-server @@ -324,7 +333,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \; %patch7 %patch8 %patch9 -p1 -%patch11 -p1 cp %{_sourcedir}/suse-test-run . @@ -401,6 +409,7 @@ export CXXFLAGS="$CFLAGS -felide-constructors" %if 0%{with_rocksdb} < 1 -DPLUGIN_ROCKSDB=NO \ %endif + -DPYTHON_SHEBANG=%{python_path} \ -DWITH_XTRADB_STORAGE_ENGINE=1 \ -DWITH_CSV_STORAGE_ENGINE=1 \ -DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \ diff --git a/my.ini b/my.ini index 5684733..9b2ff19 100644 --- a/my.ini +++ b/my.ini @@ -30,12 +30,6 @@ secure_file_priv = /var/lib/mysql-files # cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. # innodb_buffer_pool_size = 128M -# Using newer file format that supports dynamic and compressed row formats. -# If you are using replication you have to make sure, that these options are -# set everywhere the same way (probably comment them out is the easiest way) -innodb_file_format=Barracuda -innodb_file_per_table=ON - # Remove leading # to turn on a very important data integrity option: logging # changes to the binary log between backups. # log_bin=mysql-bin