Commit 93144b9e authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-13440 mysql_install_db fails with hard-coded langdir

always search in compile-time specified paths
INSTALL_BINDIR, INSTALL_SBINDIR, INSTALL_MYSQLSHAREDIR. User
can set them to arbitrary values, it's not enough to search only
in their usual values of bin, sbin and libexec, share and share/mysql.
parent 52516706
...@@ -205,10 +205,10 @@ ELSE() ...@@ -205,10 +205,10 @@ ELSE()
SET(localstatedir ${MYSQL_DATADIR}) SET(localstatedir ${MYSQL_DATADIR})
ENDIF() ENDIF()
SET(resolveip_locations "$basedir/bin") SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin")
SET(mysqld_locations "$basedir/libexec $basedir/sbin $basedir/bin") SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin")
SET(errmsg_locations "$basedir/share/english $basedir/share/mysql/english") SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english")
SET(pkgdata_locations "$basedir/share $basedir/share/mysql") SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql")
IF(UNIX) IF(UNIX)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
......
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