*Merge 1600 from tc1.

--HG--
branch : trunk

6 files changed, 21 insertions, 16 deletions

diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index 7f2bdaefdb7..4a0d655f55c 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -49,7 +49,7 @@ class TRINITY_DLL_SPEC Database
         virtual ~Database();
 
         virtual bool Initialize(const char *infoString);
-        virtual void InitDelayThread() = 0;
+        virtual void InitDelayThread(const char *infoString) = 0;
         virtual void HaltDelayThread() = 0;
 
         virtual QueryResult* Query(const char *sql) = 0;
diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index 0189b5883f7..61801d65fe5 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 DatabaseMysql::Initialize(const char *infoString, bool initDelayThread)
 {
 
     if(!Database::Initialize(infoString))
@@ -85,7 +85,8 @@ bool DatabaseMysql::Initialize(const char *infoString)
         return false;
     }
 
-    InitDelayThread();
+    if(initDelayThread)
+        InitDelayThread(infoString);
 
     Tokens tokens = StrSplit(infoString, ";");
 
@@ -435,12 +436,12 @@ unsigned long DatabaseMysql::escape_string(char *to, const char *from, unsigned
     return(mysql_real_escape_string(mMysql, to, from, length));
 }
 
-void DatabaseMysql::InitDelayThread()
+void DatabaseMysql::InitDelayThread(const char* infoString)
 {
     assert(!m_delayThread);
 
     //New delay thread for delay execute
-    m_threadBody = new MySQLDelayThread(this);
+    m_threadBody = new MySQLDelayThread(this,infoString);
     m_delayThread = new ACE_Based::Thread(*m_threadBody);
 }
 
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index 4612ebfc462..eb667703975 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);
-        void InitDelayThread();
+        bool Initialize(const char *infoString, bool initDelayThread = true);
+        void InitDelayThread(const char* infoString);
         void HaltDelayThread();
         QueryResult* Query(const char *sql);
         QueryNamedResult* QueryNamed(const char *sql);
diff --git a/src/shared/Database/MySQLDelayThread.h b/src/shared/Database/MySQLDelayThread.h
index fcebe3fbd35..12ff3337836 100644
--- a/src/shared/Database/MySQLDelayThread.h
+++ b/src/shared/Database/MySQLDelayThread.h
@@ -26,7 +26,7 @@
 class MySQLDelayThread : public SqlDelayThread
 {
     public:
-        MySQLDelayThread(Database* db) : SqlDelayThread(db) {}
+        MySQLDelayThread(Database* db,const char* infoString) : SqlDelayThread(db, infoString) {}
         void Stop() { SqlDelayThread::Stop(); }
 };
 #endif                                                      //__MYSQLDELAYTHREAD_H
diff --git a/src/shared/Database/SqlDelayThread.cpp b/src/shared/Database/SqlDelayThread.cpp
index 9a92fd5dd63..f36cf4940ce 100644
--- a/src/shared/Database/SqlDelayThread.cpp
+++ b/src/shared/Database/SqlDelayThread.cpp
@@ -22,8 +22,10 @@
 #include "Database/SqlOperations.h"
 #include "DatabaseEnv.h"
 
-SqlDelayThread::SqlDelayThread(Database* db) : m_dbEngine(db), m_running(true)
+SqlDelayThread::SqlDelayThread(Database* db, const char* infoString) :m_running(true)
 {
+    m_dbEngine = new DatabaseType;
+    ((DatabaseType*)m_dbEngine)->Initialize(infoString, false);
 }
 
 void SqlDelayThread::run()
@@ -35,15 +37,16 @@ void SqlDelayThread::run()
 
     while (m_running)
     {
-        // if the running state gets turned off while sleeping
-        // empty the queue before exiting
-        ACE_Based::Thread::Sleep(10);
-        while (!m_sqlQueue.empty())
+        try
         {
             s = m_sqlQueue.next();
-            s->Execute(m_dbEngine);
-            delete s;
         }
+        catch(...)
+            {continue;}
+        if(!s)
+            continue;
+        s->Execute(m_dbEngine);
+        delete s;
     }
 
     #ifndef DO_POSTGRESQL
@@ -54,5 +57,6 @@ void SqlDelayThread::run()
 void SqlDelayThread::Stop()
 {
     m_running = false;
+    m_sqlQueue.cancel();
 }
 
diff --git a/src/shared/Database/SqlDelayThread.h b/src/shared/Database/SqlDelayThread.h
index 3c24d3525b7..246a1325b9b 100644
--- a/src/shared/Database/SqlDelayThread.h
+++ b/src/shared/Database/SqlDelayThread.h
@@ -40,7 +40,7 @@ class SqlDelayThread : public ACE_Based::Runnable
 
         SqlDelayThread();
     public:
-        SqlDelayThread(Database* db);
+        SqlDelayThread(Database* db,const char* infoString);
 
         ///< Put sql statement to delay queue
         bool Delay(SqlOperation* sql) { m_sqlQueue.add(sql); return true; }