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