Commit 4ff2a680 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-6565 search order for my.cnf inconsistent in docs/use, and global...

MDEV-6565 search order for my.cnf inconsistent in docs/use, and global override with build-time -DDEFAULT_SYSCONFDIR is ignored

don't let INSTALL_SYSCONFDIR overwrite DEFAULT_SYSCONFDIR
parent 1e7dd850
...@@ -337,7 +337,7 @@ ELSE() ...@@ -337,7 +337,7 @@ ELSE()
ENDIF() ENDIF()
SET(DEFAULT_CHARSET_HOME "${DEFAULT_MYSQL_HOME}") SET(DEFAULT_CHARSET_HOME "${DEFAULT_MYSQL_HOME}")
SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}") SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}")
IF(INSTALL_SYSCONFDIR) IF(INSTALL_SYSCONFDIR AND NOT DEFAULT_SYSCONFDIR)
SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}") SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}")
ENDIF() ENDIF()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment