From ab3f3d0d30b44bed8088bec74f2d5472e46af5de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Hor=C3=A1k?= <hhorak@redhat.com>
Date: Mon, 2 Sep 2013 17:48:59 +0200
Subject: [PATCH] Enhanced my.cnf to be the same as in mariadb Resolves:
 #1003115

---
 community-mysql.spec |  6 +++++-
 my.cnf               | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/community-mysql.spec b/community-mysql.spec
index a5cf786..1e45798 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -1,6 +1,6 @@
 Name: community-mysql
 Version: 5.5.33
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -729,6 +729,10 @@ rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris/postinstall-solaris
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Mon Sep  2 2013 Honza Horak <hhorak@redhat.com> 5.5.33-2
+- Enhanced my.cnf to be the same as in mariadb
+  Resolves: #1003115
+
 * Tue Aug 20 2013 Honza Horak <hhorak@redhat.com> 5.5.33-1
 - Update to MySQL 5.5.33, for various fixes described at
   http://dev.mysql.com/doc/relnotes/mysql/5.5/en/news-5-5-33.html
diff --git a/my.cnf b/my.cnf
index 1df1f70..ac882ac 100644
--- a/my.cnf
+++ b/my.cnf
@@ -5,13 +5,23 @@ socket=/var/lib/mysql/mysql.sock
 symbolic-links=0
 # Settings user and group are ignored when systemd is used.
 # If you need to run mysqld under a different user or group,
-# customize your systemd unit file for mysqld according to the
+# customize your systemd unit file for mysqld/mariadb according to the
 # instructions in http://fedoraproject.org/wiki/Systemd
 
-[mysqld_safe]
+# Currently, there are mariadb and community-mysql packages in Fedora.
+# This particular config file is included in respective RPMs of both of them,
+# so the following settings are general and will be also used by both of them.
+# Otherwise the RPMs would be in conflict.
+# Settings for particular implementations like MariaDB are then
+# defined in appropriate sections; for MariaDB server in [mariadb] section in
+# /etc/my.cnf.d/server.cnf (part of mariadb-server).
+# It doesn't matter that we set these settings only for [mysqld] here,
+# because they will be read and used in mysqld_safe as well.
 log-error=/var/log/mysqld.log
 pid-file=/var/run/mysqld/mysqld.pid
 
+[mysqld_safe]
+
 #
 # include all files from the config directory
 #