PATCH-P1-FIX-UPSTREAM: Fix mysql_install_db to find data files in mariadb directories Fix mysql_install_db.sh script to find data files in mariadb directories when a user uses "--basedir" option [bsc#1006539] Maintainer: Kristyna Streitova Index: mariadb-10.2.10/scripts/CMakeLists.txt =================================================================== --- mariadb-10.2.10.orig/scripts/CMakeLists.txt +++ mariadb-10.2.10/scripts/CMakeLists.txt @@ -188,8 +188,8 @@ ENDIF() SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin") SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin") -SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english") -SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql") +SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english $basedir/share/mariadb/english") +SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql $basedir/share/mariadb") IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh