*Merge.

--HG--
branch : trunk

1 files changed, 4 insertions, 5 deletions

diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index 61801d65fe5..0189b5883f7 100644
--- a/src/shared/Database/DatabaseMysql.cpp
+++ b/src/shared/Database/DatabaseMysql.cpp
@@ -70,7 +70,7 @@ DatabaseMysql::~DatabaseMysql()
         mysql_library_end();
 }
 
-bool DatabaseMysql::Initialize(const char *infoString, bool initDelayThread)
+bool DatabaseMysql::Initialize(const char *infoString)
 {
 
     if(!Database::Initialize(infoString))
@@ -85,8 +85,7 @@ bool DatabaseMysql::Initialize(const char *infoString, bool initDelayThread)
         return false;
     }
 
-    if(initDelayThread)
-        InitDelayThread(infoString);
+    InitDelayThread();
 
     Tokens tokens = StrSplit(infoString, ";");
 
@@ -436,12 +435,12 @@ unsigned long DatabaseMysql::escape_string(char *to, const char *from, unsigned
     return(mysql_real_escape_string(mMysql, to, from, length));
 }
 
-void DatabaseMysql::InitDelayThread(const char* infoString)
+void DatabaseMysql::InitDelayThread()
 {
     assert(!m_delayThread);
 
     //New delay thread for delay execute
-    m_threadBody = new MySQLDelayThread(this,infoString);
+    m_threadBody = new MySQLDelayThread(this);
     m_delayThread = new ACE_Based::Thread(*m_threadBody);
 }