diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-28 08:46:43 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-08-28 08:50:37 +0000 |
| commit | 7fd31e497c7d3dc058c3620358f31d24e83d5007 (patch) | |
| tree | 4e3127220cccee2b69b0f27de3a25e764fb83479 /main/mariadb/fix-mysql-install-db-path.patch | |
| parent | c48e70f36d4bbe93e00283f1e937ad59fb671561 (diff) | |
| download | aports-7fd31e497c7d3dc058c3620358f31d24e83d5007.tar.bz2 aports-7fd31e497c7d3dc058c3620358f31d24e83d5007.tar.xz | |
main/mariadb: upgrade to 10.3.9 and move default config
move default config to /etc/my.cnf and /etc/my.cnf.d/. This is to make
it easier to ship default configs for clients, plugins and mysql,
without introducing conflicts.
We also add a post-upgrade script which makes sure that the
skip-networking setting does not disable networking in a pre-existing
config on upgrade.
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") |