| 1 |
johu 15/06/26 22:30:31 |
| 2 |
|
| 3 |
Added: akonadi-server-1.13.0-mysql56-crash.patch |
| 4 |
Log: |
| 5 |
Revision bump adds patch by Brian Evans <grknight@g.o>, fixes a crash with dev-db/mysql-5.6m bug #530012. |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xFDF4F788) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: akonadi-server-1.13.0-mysql56-crash.patch |
| 16 |
=================================================================== |
| 17 |
diff -aruN akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp |
| 18 |
--- akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp 2014-08-10 06:38:58.000000000 -0400 |
| 19 |
+++ akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp 2015-01-08 15:08:36.906134212 -0500 |
| 20 |
@@ -76,6 +76,7 @@ |
| 21 |
<< QLatin1String( "/usr/local/sbin" ) |
| 22 |
<< QLatin1String( "/usr/local/libexec" ) |
| 23 |
<< QLatin1String( "/usr/libexec" ) |
| 24 |
+ << QLatin1String( "/usr/share/mysql/scripts" ) |
| 25 |
<< QLatin1String( "/opt/mysql/libexec" ) |
| 26 |
<< QLatin1String( "/opt/local/lib/mysql5/bin" ) |
| 27 |
<< QLatin1String( "/opt/mysql/sbin" ); |
| 28 |
@@ -278,7 +279,7 @@ |
| 29 |
// first run, some MySQL versions need a mysql_install_db run for that |
| 30 |
const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) ); |
| 31 |
if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) { |
| 32 |
- const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); |
| 33 |
+ const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=/usr" ) ; |
| 34 |
QProcess::execute( mMysqlInstallDbPath, arguments ); |
| 35 |
} |
Archives