Blame SOURCES/mariadb-ownsetup.patch

4b4994
diff -up mariadb-10.1.8/support-files/CMakeLists.txt.p9 mariadb-10.1.8/support-files/CMakeLists.txt
4b4994
--- mariadb-10.1.8/support-files/CMakeLists.txt.p9	2015-11-03 11:38:46.029139464 +0100
4b4994
+++ mariadb-10.1.8/support-files/CMakeLists.txt	2015-11-03 11:41:07.107605055 +0100
4b4994
@@ -62,6 +62,7 @@ IF(UNIX)
4b4994
   ENDIF()
4b4994
 
4b4994
   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
4b4994
+  CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
4b4994
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
4b4994
 
4b4994
   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
4b4994
diff -up mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup mariadb-10.0.15/support-files/rpm/server.cnf
4b4994
--- mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup	2015-01-24 23:55:55.110063592 +0100
4b4994
+++ mariadb-10.0.15/support-files/rpm/server.cnf	2015-01-24 23:57:42.308114387 +0100
4b4994
@@ -9,7 +9,16 @@
4b4994
 [server]
4b4994
 
4b4994
 # this is only for the mysqld standalone daemon
4b4994
+# Settings user and group are ignored when systemd is used.
4b4994
+# If you need to run mysqld under a different user or group,
4b4994
+# customize your systemd unit file for mysqld/mariadb according to the
4b4994
+# instructions in http://fedoraproject.org/wiki/Systemd
4b4994
 [mysqld]
4b4994
+datadir=@MYSQL_DATADIR@
4b4994
+socket=@MYSQL_UNIX_ADDR@
4b4994
+log-error=@LOG_LOCATION@
4b4994
+pid-file=@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid
4b4994
+
4b4994
 
4b4994
 #
4b4994
 # * Galera-related settings