From kde-commits  Mon Feb 28 23:08:15 2011
From: Christophe Giboudeaux <cgiboudeaux () gmail ! com>
Date: Mon, 28 Feb 2011 23:08:15 +0000
To: kde-commits
Subject: =?utf-8?q?=5Bakonadi=5D_server/src/storage=3A_Make_sure_we_use_t?=
Message-Id: <20110228230815.9D645A60C9 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129893453125870

Git commit 5a19a29162723a22088d4d91fcab1b833c54cc7f by Christophe Giboudeaux.
Committed on 11/01/2011 at 14:54.
Pushed by cgiboudeaux into branch 'master'.

Make sure we use the default DB name when using the internal server

BUG 262218

M  +3    -1    server/src/storage/dbconfigmysql.cpp     

http://commits.kde.org/akonadi/5a19a29162723a22088d4d91fcab1b833c54cc7f

diff --git a/server/src/storage/dbconfigmysql.cpp b/server/src/storage/dbconfigmysql.cpp
index 9f6ad05..2910700 100644
--- a/server/src/storage/dbconfigmysql.cpp
+++ b/server/src/storage/dbconfigmysql.cpp
@@ -111,8 +111,10 @@ bool DbConfigMysql::init( QSettings &settings )
   settings.endGroup();
 
   // verify settings and apply permanent changes (written out below)
-  if ( mInternalServer )
+  if ( mInternalServer ) {
     mConnectionOptions = defaultOptions;
+    mDatabaseName = defaultDbName;
+  }
   if ( mInternalServer && (mServerPath.isEmpty() || !QFile::exists( mServerPath ) ) )
     mServerPath = defaultServerPath;