|
Lines 76-81
Link Here
|
| 76 |
<< QLatin1String( "/usr/local/sbin" ) |
76 |
<< QLatin1String( "/usr/local/sbin" ) |
| 77 |
<< QLatin1String( "/usr/local/libexec" ) |
77 |
<< QLatin1String( "/usr/local/libexec" ) |
| 78 |
<< QLatin1String( "/usr/libexec" ) |
78 |
<< QLatin1String( "/usr/libexec" ) |
|
|
79 |
<< QLatin1String( "/usr/share/mysql/scripts" ) |
| 79 |
<< QLatin1String( "/opt/mysql/libexec" ) |
80 |
<< QLatin1String( "/opt/mysql/libexec" ) |
| 80 |
<< QLatin1String( "/opt/local/lib/mysql5/bin" ) |
81 |
<< QLatin1String( "/opt/local/lib/mysql5/bin" ) |
| 81 |
<< QLatin1String( "/opt/mysql/sbin" ); |
82 |
<< QLatin1String( "/opt/mysql/sbin" ); |
|
Lines 278-284
Link Here
|
| 278 |
// first run, some MySQL versions need a mysql_install_db run for that |
279 |
// first run, some MySQL versions need a mysql_install_db run for that |
| 279 |
const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) ); |
280 |
const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) ); |
| 280 |
if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) { |
281 |
if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) { |
| 281 |
const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); |
282 |
const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=/usr" ) ; |
| 282 |
QProcess::execute( mMysqlInstallDbPath, arguments ); |
283 |
QProcess::execute( mMysqlInstallDbPath, arguments ); |
| 283 |
} |
284 |
} |
| 284 |
|
285 |
|
