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