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