*Merge.

--HG--
branch : trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index eb667703975..4612ebfc462 100644
--- a/src/shared/Database/DatabaseMysql.h
+++ b/src/shared/Database/DatabaseMysql.h
@@ -46,8 +46,8 @@ class TRINITY_DLL_SPEC DatabaseMysql : public Database
 
         //! Initializes Mysql and connects to a server.
         /*! infoString should be formated like hostname;username;password;database. */
-        bool Initialize(const char *infoString, bool initDelayThread = true);
-        void InitDelayThread(const char* infoString);
+        bool Initialize(const char *infoString);
+        void InitDelayThread();
         void HaltDelayThread();
         QueryResult* Query(const char *sql);
         QueryNamedResult* QueryNamed(const char *sql);