Gentoo-bug: 530012 diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp index 5cfaa33..1d1ea02 100644 --- a/src/server/storage/dbconfigmysql.cpp +++ b/src/server/storage/dbconfigmysql.cpp @@ -81,6 +81,7 @@ bool DbConfigMysql::init(QSettings &settings) << QStringLiteral("/usr/local/sbin") << QStringLiteral("/usr/local/libexec") << QStringLiteral("/usr/libexec") + << QStringLiteral("/usr/share/mysql/scripts") << QStringLiteral("/opt/mysql/libexec") << QStringLiteral("/opt/local/lib/mysql5/bin") << QStringLiteral("/opt/mysql/sbin"); @@ -512,7 +513,7 @@ bool DbConfigMysql::initializeMariaDBDatabase(const QString &confFile, const QSt return 0 == execute(mMysqlInstallDbPath, { QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--force"), - QStringLiteral("--basedir=%1").arg(baseDir), + QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir) }); } @@ -525,6 +526,7 @@ bool DbConfigMysql::initializeMySQL5_7_6Database(const QString &confFile, const return 0 == execute(mMysqldPath, { QStringLiteral("--defaults-file=%1").arg(confFile), QStringLiteral("--initialize"), + QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir) }); } @@ -538,6 +540,6 @@ bool DbConfigMysql::initializeMySQLDatabase(const QString &confFile, const QStri // Don't use --force, it has been removed in MySQL 5.7.5 return 0 == execute(mMysqlInstallDbPath, { QStringLiteral("--defaults-file=%1").arg(confFile), - QStringLiteral("--basedir=%1").arg(baseDir), + QStringLiteral("--basedir=/usr"), QStringLiteral("--datadir=%1/").arg(dataDir) }); }