From 2d4940e1b1bb40f5a519452ccf868ffcb0b680453bda9dbe2fb2a29e38f12ffe Mon Sep 17 00:00:00 2001
From: "Michal Hrusecky (old before rename to _miska_)"
 <michal.hrusecky@opensuse.org>
Date: Thu, 19 Sep 2013 08:03:47 +0000
Subject: [PATCH] - comment out old settings if not present

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=140
---
 configuration-tweaks.tar.bz2 | 4 ++--
 mariadb.changes              | 5 +++++
 mysql-patches.tar.bz2        | 4 ++--
 rc.mysql-multi               | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2
index ea80dbd..06f5a25 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:e984f08df29952690d72fd06bb3751d372456eed2f6187216a1a83fe49499a61
-size 310
+oid sha256:d2dececd5b4555523534954a2ca936322440699114cc12b5caf9dfc21ce42e05
+size 318
diff --git a/mariadb.changes b/mariadb.changes
index 9b4c9e0..f00ec7e 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 19 08:03:20 UTC 2013 - mhrusecky@suse.com
+
+- comment out old settings if not present
+
 -------------------------------------------------------------------
 Wed Sep 18 23:33:33 CEST 2013 - mhrusecky@suse.cz
 
diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2
index 14e86ac..6eac4ce 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:eebbc67d1ef5d5f449da9b44f5a4dabe98c56dc364e38082038587ecdaeb11db
-size 12384
+oid sha256:5e9984c1676d989cc011b229902b741f17d35b4c547a8a57d3f32e9f9ed66a92
+size 12386
diff --git a/rc.mysql-multi b/rc.mysql-multi
index 9cd8cc7..466d32c 100644
--- a/rc.mysql-multi
+++ b/rc.mysql-multi
@@ -372,6 +372,8 @@ else
 			echo "	/usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade"
 			sed -i -e 's|^\([[:blank:]]*\)skip-locking|\1skip-external-locking|' \
 			       -e 's|^\([[:blank:]]*skip-federated\)|#\1|' /etc/my.cnf
+			[ -d /etc/mysql ] || \
+			sed -i 's|^\([[:blank:]]*!includedir\ /etc/mysql[[:blank:]]*\)$|#\1|' /etc/my.cnf
 			# Check logs for inconsistencies
 			SRCLOGS=""
 			ALL_SRCLOGS=""