From b1ca2a27cf990d70ed2be89e469ae8ddd599e83f22cafa889be75dc42e5a1749 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 12 Nov 2019 14:59:48 +0000 Subject: [PATCH] Accepting request 747661 from home:kstreitova:branches:server:database - update to 10.3.20 * notable changes for 10.3.20 * MDEV-20987: InnoDB fails to start when FTS table has FK relation * notable changes for 10.3.19 * MDEV-20864: Debug-only option innodb_change_buffer_dump for dumping the contents of the InnoDB change buffer to the server error log at startup. * MariaBackup: * MDEV-18438: mbstream recreates xtrabackup_info on same directory as backup file * MDEV-20703: mariabackup creates binlog files in serve binlog directory on --prepare --export step * FULLTEXT INDEX: * MDEV-19647: Server hangs after dropping full text indexes and restart * MDEV-19529: InnoDB hang on DROP FULLTEXT INDEX * MDEV-19073: FTS row mismatch after crash recovery * MDEV-20621: FULLTEXT INDEX activity causes InnoDB hang * MDEV-20927: Duplicate key with auto increment * ALTER TABLE: * MDEV-20799: DROP Virtual Column crash * MDEV-20852: BtrBulk is unnecessarily holding dict_index_t::lock * System-Versioned Tables: * MDEV-16210: FK constraints on versioned tables use historical rows, which may cause constraint violation * MDEV-20812: Unexpected ER_ROW_IS_REFERENCED_2 or server crash in row_ins_foreign_report_err upon DELETE from versioned table with FK * Galera wsrep library updated to 25.3.28 * Fixes for the following security vulnerabilities: OBS-URL: https://build.opensuse.org/request/show/747661 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=239 --- mariadb-10.0.15-logrotate-su.patch | 2 +- mariadb-10.2.4-logrotate.patch | 2 +- mariadb-10.3.17-fix_ppc_build.patch | 27 ------------------ mariadb-10.3.18.tar.gz | 3 -- mariadb-10.3.18.tar.gz.sig | 6 ---- mariadb-10.3.20.tar.gz | 3 ++ mariadb-10.3.20.tar.gz.sig | 6 ++++ mariadb.changes | 44 +++++++++++++++++++++++++++++ mariadb.spec | 4 +-- 9 files changed, 56 insertions(+), 41 deletions(-) delete mode 100644 mariadb-10.3.17-fix_ppc_build.patch delete mode 100644 mariadb-10.3.18.tar.gz delete mode 100644 mariadb-10.3.18.tar.gz.sig create mode 100644 mariadb-10.3.20.tar.gz create mode 100644 mariadb-10.3.20.tar.gz.sig diff --git a/mariadb-10.0.15-logrotate-su.patch b/mariadb-10.0.15-logrotate-su.patch index 6fcec1d..7c4a1ab 100644 --- a/mariadb-10.0.15-logrotate-su.patch +++ b/mariadb-10.0.15-logrotate-su.patch @@ -13,5 +13,5 @@ Index: support-files/mysql-log-rotate.sh # create 600 mysql mysql + su mysql mysql notifempty - daily + daily rotate 3 diff --git a/mariadb-10.2.4-logrotate.patch b/mariadb-10.2.4-logrotate.patch index 975bf6b..1781c7d 100644 --- a/mariadb-10.2.4-logrotate.patch +++ b/mariadb-10.2.4-logrotate.patch @@ -17,7 +17,7 @@ Index: support-files/mysql-log-rotate.sh +/var/log/mysql/*.log { # create 600 mysql mysql notifempty - daily + daily @@ -32,6 +32,14 @@ then @bindir@/mysqladmin --local flush-error-log \ diff --git a/mariadb-10.3.17-fix_ppc_build.patch b/mariadb-10.3.17-fix_ppc_build.patch deleted file mode 100644 index a44b84c..0000000 --- a/mariadb-10.3.17-fix_ppc_build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 13e8f728ec83133b990ed21404cbac1d8a0bc74c Mon Sep 17 00:00:00 2001 -From: Sergei Golubchik -Date: Sun, 16 Jun 2019 01:25:03 +0200 -Subject: [PATCH] compilation failure on ppc with -DCMAKE_BUILD_TYPE=Debug - -if ${CRC32_LIBRARY} target has no COMPILE_FLAGS yet, -GET_TARGET_PROPERTY returns COMPILE_FLAGS-NOTFOUND, which -doesn't work very well when it's later fed back into COMPILE_FLAGS. - -GET_PROPERTY() returns an empty string in this case. ---- - extra/crc32-vpmsum/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/extra/crc32-vpmsum/CMakeLists.txt b/extra/crc32-vpmsum/CMakeLists.txt -index 31c09a97d6af..b4adebdadf5a 100644 ---- a/extra/crc32-vpmsum/CMakeLists.txt -+++ b/extra/crc32-vpmsum/CMakeLists.txt -@@ -2,7 +2,7 @@ ADD_CONVENIENCE_LIBRARY(${CRC32_LIBRARY} $ $ + +- update to 10.3.20 + * notable changes for 10.3.20 + * MDEV-20987: InnoDB fails to start when FTS table has FK relation + * notable changes for 10.3.19 + * MDEV-20864: Debug-only option innodb_change_buffer_dump for + dumping the contents of the InnoDB change buffer to the + server error log at startup. + * MariaBackup: + * MDEV-18438: mbstream recreates xtrabackup_info on same + directory as backup file + * MDEV-20703: mariabackup creates binlog files in serve + binlog directory on --prepare --export step + * FULLTEXT INDEX: + * MDEV-19647: Server hangs after dropping full text indexes + and restart + * MDEV-19529: InnoDB hang on DROP FULLTEXT INDEX + * MDEV-19073: FTS row mismatch after crash recovery + * MDEV-20621: FULLTEXT INDEX activity causes InnoDB hang + * MDEV-20927: Duplicate key with auto increment + * ALTER TABLE: + * MDEV-20799: DROP Virtual Column crash + * MDEV-20852: BtrBulk is unnecessarily holding dict_index_t::lock + * System-Versioned Tables: + * MDEV-16210: FK constraints on versioned tables use historical + rows, which may cause constraint violation + * MDEV-20812: Unexpected ER_ROW_IS_REFERENCED_2 or server + crash in row_ins_foreign_report_err upon DELETE from + versioned table with FK + * Galera wsrep library updated to 25.3.28 + * Fixes for the following security vulnerabilities: + CVE-2019-2974, CVE-2019-2938 + * release notes and changelog: + https://mariadb.com/kb/en/library/mariadb-10320-release-notes + https://mariadb.com/kb/en/library/mariadb-10320-changelog + https://mariadb.com/kb/en/library/mariadb-10319-release-notes + https://mariadb.com/kb/en/library/mariadb-10319-changelog +- remove mariadb-10.3.17-fix_ppc_build.patch (applied upstream) +- refresh + * mariadb-10.2.4-logrotate.patch + * mariadb-10.0.15-logrotate-su.patch + ------------------------------------------------------------------- Tue Sep 24 11:08:33 UTC 2019 - Kristyna Streitova diff --git a/mariadb.spec b/mariadb.spec index a5f3d7f..2cc885e 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -54,7 +54,7 @@ %define python_path /usr/bin/python2 %endif Name: mariadb -Version: 10.3.18 +Version: 10.3.20 Release: 0 Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception @@ -77,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 -Patch10: mariadb-10.3.17-fix_ppc_build.patch # needed for bison SQL parser and wsrep API BuildRequires: bison BuildRequires: cmake @@ -334,7 +333,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \; %patch7 %patch8 %patch9 -p1 -%patch10 -p1 cp %{_sourcedir}/suse-test-run .