From d55af5babd935f5aa3267f441c201c366e27201193d0dc6928e56fa9a7d90acf Mon Sep 17 00:00:00 2001
From: "Michal Hrusecky (old before rename to _miska_)"
 <michal.hrusecky@opensuse.org>
Date: Thu, 6 Jun 2013 13:23:51 +0000
Subject: [PATCH] - enable support for libaio (bnc#796164) - better rights for
 logdir (bnc#789263)

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=117
---
 configuration-tweaks.tar.bz2 |  4 ++--
 install.inc                  |  2 +-
 mariadb.changes              |  6 ++++++
 mariadb.spec                 | 10 ++++++++++
 mysql-patches.tar.bz2        |  4 ++--
 rc.mysql-multi               |  4 ++--
 6 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index 86a6571..742d2d5 100644
--- a/configuration-tweaks.tar.bz2
+++ b/configuration-tweaks.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65ac32a3b776ada3b317d1bb596dd3623499f1b408d598ded05f691a02364562
-size 321
+oid sha256:ac5ba7427aed3e005cc0f19dabb58c1e69856c054d3016adf538b46c1df2d2e9
+size 312
diff --git a/install.inc b/install.inc
index 31da97a..c4495b0 100644
--- a/install.inc
+++ b/install.inc
@@ -167,6 +167,6 @@ if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so`" ]; then
 	echo '%%dir %%_libdir/mysql/plugin'        >> mysql-client.files
 	echo '%%_libdir/mysql/plugin/dialog*.so'   >> mysql-client.files
 fi
-rm -rf '%buildroot'/usr/share/doc/%{name}-%{version}
+rm -rf '%buildroot'/usr/share/doc/{mysql,mariadb}*
 rm -rf '%buildroot'/usr/share/mysql/solaris
 rm -rf '%buildroot'/usr/share/mysql/SELinux
diff --git a/mariadb.changes b/mariadb.changes
index dad4da5..5269aa9 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  6 13:22:37 UTC 2013 - mhrusecky@suse.com
+
+- enable support for libaio (bnc#796164)
+- better rights for logdir (bnc#789263)
+
 -------------------------------------------------------------------
 Wed Jun  5 08:48:42 UTC 2013 - mhrusecky@suse.com
 
diff --git a/mariadb.spec b/mariadb.spec
index cf7161c..de682d0 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -61,6 +61,7 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
+BuildRequires:  libaio-devel
 BuildRequires:  libedit-devel
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
@@ -171,6 +172,9 @@ languages and applications need to dynamically load and use MariaDB.
 Summary:        Client for MariaDB
 Group:          Productivity/Databases/Clients
 Provides:       mysql-client = %{srv_vers}
+%if 0%{?suse_version}
+PreReq:         pwdutils
+%endif
 %if 0%{?use_extra_provides} > 0
 Provides:       %{extra_provides}-client = %{version}
 Obsoletes:      %{extra_provides}-client < %{version}
@@ -385,6 +389,12 @@ rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result
 %service_add_pre mysql.service
 %endif
 
+%pre client
+/usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || :
+/usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \
+                  -s /bin/false -d /var/lib/mysql mysql 2> /dev/null || :
+/usr/sbin/usermod -g mysql -s /bin/false mysql || :
+
 %post
 # systemd requirment 
 %if 0%{?suse_version} >= 1210
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index 2fcb8f8..6155a3a 100644
--- a/mysql-patches.tar.bz2
+++ b/mysql-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:242cbdabafce318f7351fc293fc1ad224c7ecef4392041ba94d42518e9d8ac1a
-size 11793
+oid sha256:2a44cd8a364876bd0dca1b99b63374f75bd6eca42c68c018e69429263d2f533d
+size 11797
diff --git a/rc.mysql-multi b/rc.mysql-multi
index ba55a2f..de8fa0e 100644
--- a/rc.mysql-multi
+++ b/rc.mysql-multi
@@ -329,7 +329,7 @@ else
 			log_dir="`dirname "$i"`"
 			if [ \! -d "$log_dir" ]; then
 				mkdir -p "$log_dir"
-				chmod 660 "$log_dir"
+				chmod 770 "$log_dir"
 			fi
 		done
 
@@ -350,7 +350,7 @@ else
 			echo >> "$log_upgrade"
 			echo "Will update MySQL now, if you encounter any problems, please read following file:" | tee -a "$log_upgrade"
 			echo "	/usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade"
-			sed -i -e 's|^\([^#]*skip-locking\)|#\1|' \
+			sed -i -e 's|^\([^#]*skip-locking\)|#\1\nskip-external-locking|' \
 			       -e 's|^\([^#]*skip-federated\)|#\1|' /etc/my.cnf
 			# Check logs for inconsistencies
 			SRCLOGS=""