76e6c4c
--- mariadb-10.4.14/support-files/CMakeLists.txt	2020-08-06 17:28:28.000000000 +0200
76e6c4c
+++ mariadb-10.4.14/support-files/CMakeLists.txt_patched	2020-09-03 13:21:07.826658279 +0200
76e6c4c
@@ -187,6 +187,7 @@ IF(UNIX)
76e6c4c
               COMPONENT SharedLibraries)
76e6c4c
       INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
76e6c4c
               COMPONENT Client)
76e6c4c
+      CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_SOURCE_DIR}/rpm/server.cnf @ONLY)
76e6c4c
       INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
76e6c4c
               COMPONENT IniFiles)
76e6c4c
       INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR}
76e6c4c
383e14b
diff -up mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup mariadb-10.0.15/support-files/rpm/server.cnf
383e14b
--- mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup	2015-01-24 23:55:55.110063592 +0100
383e14b
+++ mariadb-10.0.15/support-files/rpm/server.cnf	2015-01-24 23:57:42.308114387 +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