Blame SOURCES/mariadb-ownsetup.patch

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