File Fix-order-of-arguments-in-defaultCleanShutdownCommand.patch of Package akonadi4-runtime
From 87852b50e5fb740b6fd38cf1fc36fc8b782dac7a Mon Sep 17 00:00:00 2001
From: Martin Koller <kollix@aon.at>
Date: Sun, 2 Aug 2015 17:31:36 +0200
Subject: [PATCH] Fix the order of the arguments in the
defaultCleanShutdownCommand
REVIEW: 124593
---
src/server/storage/dbconfigmysql.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/src/storage/dbconfigmysql.cpp b/server/src/storage/dbconfigmysql.cpp
index 5ce81f94b..a18144d8f 100644
--- a/server/src/storage/dbconfigmysql.cpp
+++ b/server/src/storage/dbconfigmysql.cpp
@@ -88,7 +88,7 @@ bool DbConfigMysql::init(QSettings &settings)
const QString mysqladminPath = XdgBaseDirs::findExecutableFile( QLatin1String( "mysqladmin" ), mysqldSearchPath );
if ( !mysqladminPath.isEmpty() ) {
#ifndef Q_OS_WIN
- defaultCleanShutdownCommand = QString::fromLatin1( "--defaults-file=%1/mysql.conf %2 shutdown --socket=%3/mysql.socket" )
+ defaultCleanShutdownCommand = QString::fromLatin1( "%2 --defaults-file=%1/mysql.conf --socket=%3/mysql.socket shutdown" )
.arg( AkStandardDirs::saveDir( "data" ) )
.arg( mysqladminPath )
.arg( socketDirectory );
--
GitLab