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