eb90251931
* let Akonadi install default 'mysql' database;
* lower 'wait_timeout' to avoid overflow and avoid premature
connection closing.
- Add update instructions to UPDATING. [1]
- Convert to OPTIONSng.
- Bump PORTREVISION.
KMail 2 and other Akonadi-enabled programs are now working
successfully. Thanks to Dwayne MacKinnon and Mel Flynn who helped
investigating the bug.
Reviewed by: rakuco [1]
11 lines
1,022 B
C++
11 lines
1,022 B
C++
--- ./server/src/storage/dbconfigmysql.cpp.orig 2012-06-13 02:11:19.473370856 +0200
|
|
+++ ./server/src/storage/dbconfigmysql.cpp 2012-06-13 02:11:50.113468897 +0200
|
|
@@ -242,7 +242,7 @@
|
|
// first run, some MySQL versions need a mysql_install_db run for that
|
|
const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String("akonadi/mysql-global.conf" ));
|
|
if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) {
|
|
- const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
|
|
+ const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=%%LOCALBASE%%" );
|
|
QProcess::execute( mMysqlInstallDbPath, arguments );
|
|
}
|
|
|