Accepting request 680132 from server:database

OBS-URL: https://build.opensuse.org/request/show/680132
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=82

mariadb-10.0.15-logrotate-su.patch

@@ -9,7 +9,7 @@ Index: support-files/mysql-log-rotate.sh
 +++ support-files/mysql-log-rotate.sh
 @@ -20,6 +20,7 @@
  
- /var/log/mysql/mysqld.log {
+ /var/log/mysql/*.log {
          # create 600 mysql mysql
 +        su mysql mysql
          notifempty

mariadb-10.2.21.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:637f0808b65ec06902897a2f885a60377828d019d35802402dca541f8113536c
-size 71878359

mariadb-10.2.21.tar.gz.sig

@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iEYEABECAAYFAlws2NYACgkQy8sIKhu5Q9veqACeP4v5LxNsRotyH52zbKshFKBW
-BtoAoLZXbo/t4HOuTpvM+bG9fUbGV9Ro
-=ZFsS
------END PGP SIGNATURE-----

mariadb-10.2.22-fix_path.patch

@@ -0,0 +1,41 @@
+From 431da59f1ce2b594ef465563bf18f670f07a1b32 Mon Sep 17 00:00:00 2001
+From: Oleksandr Byelkin <sanja@mariadb.com>
+Date: Tue, 19 Feb 2019 16:09:46 +0100
+Subject: [PATCH] 1. centos has symlinks /bin->usr/bin and /sbin -> usr/sbin,
+ but even if this script called as /bin/mysql_install_db it is still standard
+ install and scripts are in /usr/share/ (but not in the /share/) 2. fix of
+ bindir path
+
+---
+ scripts/mysql_install_db.sh | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+Index: mariadb-10.2.22/scripts/mysql_install_db.sh
+===================================================================
+--- mariadb-10.2.22.orig/scripts/mysql_install_db.sh
++++ mariadb-10.2.22/scripts/mysql_install_db.sh
+@@ -303,6 +303,8 @@ fi
+ parse_arguments `"$print_defaults" $defaults $defaults_group_suffix --mysqld mysql_install_db`
+ parse_arguments PICK-ARGS-FROM-ARGV "$@"
+ 
++rel_mysqld="$dirname0/@INSTALL_SBINDIR@/mysqld"
++
+ # Configure paths to support files
+ if test -n "$srcdir"
+ then
+@@ -344,12 +346,12 @@ then
+   fi
+   plugindir=`find_in_dirs --dir auth_socket.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin`
+ # relative from where the script was run for a relocatable install
+-elif test -n "$dirname0" -a -x "$dirname0/@INSTALL_SBINDIR@/mysqld"
++elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld"
+ then
+   basedir="$dirname0"
+-  bindir="$basedir/@INSTALL_SBINDIR@"
++  bindir="$basedir/@INSTALL_BINDIR@"
+   resolveip="$bindir/resolveip"
+-  mysqld="$basedir/@INSTALL_SBINDIR@/mysqld"
++  mysqld="$rel_mysqld"
+   srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
+   buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
+   plugindir="$basedir/@INSTALL_PLUGINDIR@"

mariadb-10.2.22.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42f4c54c29b7c196bd105bbf4d2ea721f869b14cb7ba436c3566e6dd2760614c
+size 71907765

mariadb-10.2.22.tar.gz.sig

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEABECAAYFAlxgmjMACgkQy8sIKhu5Q9s0OQCgxL8Ee/3xsY3vIG1AxLuSZ4kN
+zWwAnjGqw4WqIs9zCu/EH5LDEfMe6KjK
+=H0ib
+-----END PGP SIGNATURE-----

mariadb-10.2.4-logrotate.patch

@@ -14,7 +14,7 @@ Index: support-files/mysql-log-rotate.sh
  # for root !
  
 -@localstatedir@/mysqld.log {
-+/var/log/mysql/mysqld.log {
++/var/log/mysql/*.log {
          # create 600 mysql mysql
          notifempty
  	daily

mariadb.changes

@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Wed Feb 27 14:48:43 UTC 2019 - kstreitova@suse.com
+
+- add mariadb-10.2.22-fix_path.patch to fix a path to resolveip in
+  mysql_install_db script [bsc#1127027] MDEV-18526
+
+-------------------------------------------------------------------
+Thu Feb 21 15:46:53 UTC 2019 - kstreitova@suse.com
+
+- my.cnf/my.ini: move slow_query_log example to the error log so
+  it's logically together
+
+-------------------------------------------------------------------
+Mon Feb 18 21:58:17 UTC 2019 - suse+build@de-korte.org
+
+- fix references path below legacy directory /var/run -> /run
+
+-------------------------------------------------------------------
+Fri Feb 15 15:39:01 UTC 2019 - rick.salevsky@suse.com
+
+- remove xtrabackup requirement as MariaDB ships a build in
+  mariabackup so xtrabackup is not needed unless a user specificaly
+  wants to use xtrabackup as sst method
+
+-------------------------------------------------------------------
+Thu Feb 14 15:01:27 UTC 2019 - Thomas Bechtold <tbechtold@suse.com>
+
+- add slow_query_log example to my.cnf and adjust the logrotate
+  configuration to rotate all /var/log/mysql/*.log files .
+  This is useful when the slow query log is enabled. In that case,
+  this log file should also be rotated (bsc#1112767)
+
+-------------------------------------------------------------------
+Tue Feb 12 13:48:59 UTC 2019 - Nicolas Bock <nicolas.bock@suse.com>
+
+- update to 10.2.22 GA
+  * notable changes:
+    * Backport Information Schema CHECK_CONSTRAINTS Table.
+    * MDEV-17475: Maximum value of table_definition_cache is
+      now 2097152
+    * InnoDB ALTER TABLE fixes: MDEV-16499, MDEV-18186, MDEV-18237,
+      MDEV-18222, MDEV-18256, MDEV-18016, MDEV-16849
+    * Mariabackup fixes: MDEV-18185, MDEV-18201, MDEV-18194
+    * Galera crash recovery fix: MDEV-15740
+    * Encryption fixes: MDEV-18129, MDEV-18183, MDEV-18279
+  * Fixes for the following security vulnerabilities:
+    * CVE-2019-2510, CVE-2019-2537
+  * release notes and changelog:
+    https://mariadb.com/kb/en/library/mariadb-10222-release-notes
+    https://mariadb.com/kb/en/library/mariadb-10222-changelog
+
 -------------------------------------------------------------------
 Thu Jan  3 15:01:44 UTC 2019 - kstreitova@suse.com
 

mariadb.spec

@@ -49,7 +49,7 @@
 %define with_mroonga 0
 %endif
 Name:           mariadb
-Version:        10.2.21
+Version:        10.2.22
 Release:        0
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
@@ -78,6 +78,7 @@ 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
+Patch12:        mariadb-10.2.22-fix_path.patch
 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  dos2unix
@@ -228,7 +229,6 @@ Requires:       lsof
 Requires:       rsync
 Requires:       socat
 Requires:       which
-Requires:       xtrabackup
 # We need Conflicts here as galera_new_cluster (and use_galera_new_cluster.conf)
 # and galera_recovery scripts were in mariadb package but now they are in galera
 # subpackage
@@ -334,6 +334,7 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 %patch8 -p0
 %patch9 -p1
 %patch11 -p1
+%patch12 -p1
 
 cp %{_sourcedir}/suse-test-run .
 
@@ -388,8 +389,8 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
        -DWITH_EDITLINE=system                                       \
        -DINSTALL_LAYOUT=RPM                                         \
        -DWITH_LZ4=system                                            \
-       -DMYSQL_UNIX_ADDR="%{_localstatedir}/run/mysql/mysql.sock"   \
-       -DINSTALL_UNIX_ADDRDIR="%{_localstatedir}/run/mysql/mysql.sock" \
+       -DMYSQL_UNIX_ADDR="%{_rundir}/mysql/mysql.sock"              \
+       -DINSTALL_UNIX_ADDRDIR="%{_rundir}/mysql/mysql.sock"         \
        -DINSTALL_MYSQLSHAREDIR=share/%{name}                        \
        -DWITH_COMMENT="openSUSE mariadb rpm"                        \
        -DWITH_EXTRA_CHARSET=all                                     \

my.ini

@@ -18,6 +18,10 @@ bind-address    = 127.0.0.1
 # which is not beneficial for rotating the log file if it grows in size.
 log-error       = /var/log/mysql/mysqld.log
 
+# Enable the slow query log to see queries with especially long duration
+# slow_query_log=1
+# slow_query_log_file = /var/log/mysql/mysqld_slow.log
+
 # Operations 'LOAD DATA', 'SELECT ... INTO' and 'LOAD FILE()' will only
 # work with files in the specified directory
 secure_file_priv = /var/lib/mysql-files