diff options
Diffstat (limited to 'main/mariadb/fix-mysql-install-db-path.patch')
| -rw-r--r-- | main/mariadb/fix-mysql-install-db-path.patch | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/main/mariadb/fix-mysql-install-db-path.patch b/main/mariadb/fix-mysql-install-db-path.patch index 3f4866188b..cabb28711b 100644 --- a/main/mariadb/fix-mysql-install-db-path.patch +++ b/main/mariadb/fix-mysql-install-db-path.patch @@ -1,9 +1,15 @@ +diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt +index 464c00d..d75874e 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt -@@ -167,23 +167,13 @@ - # i.e. makes access relative the current directory. This matches - # the documentation, so better not change this. +@@ -166,29 +166,13 @@ SET(HOSTNAME "hostname") + SET(MYSQLD_USER "mysql") + ENDIF(UNIX) +-# Really ugly, one script, "mysql_install_db", needs prefix set to ".", +-# i.e. makes access relative the current directory. This matches +-# the documentation, so better not change this. +- -IF(INSTALL_LAYOUT MATCHES "STANDALONE") - SET(prefix ".") - SET(bindir ${prefix}/${INSTALL_BINDIR}) @@ -11,6 +17,7 @@ - SET(scriptdir ${prefix}/${INSTALL_BINDIR}) - SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) - SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +- SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) - SET(localstatedir ${prefix}/data) -ELSE() - SET(prefix "${CMAKE_INSTALL_PREFIX}") @@ -19,6 +26,7 @@ - SET(scriptdir ${INSTALL_BINDIRABS}) - SET(libexecdir ${INSTALL_SBINDIRABS}) - SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS}) +- SET(pkgplugindir ${INSTALL_PLUGINDIRABS}) - SET(localstatedir ${MYSQL_DATADIR}) -ENDIF() +SET(prefix "${CMAKE_INSTALL_PREFIX}") @@ -29,5 +37,5 @@ +SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +SET(localstatedir ${MYSQL_DATADIR}) - IF(UNIX) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh + SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin") + SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin") |