Fix memory leak if we send STARTTLS twice, thanks special and psychon

[user/henk/code/inspircd.git] / src / modules / extra / m_mysql.cpp

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 03dd9934281452148101773c6e2db1d43d2f06d0..be6f4bc4c89e957c7314bc9e285afda795526e20 100644 (file)
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -11,6 +11,9 @@
  * ---------------------------------------------------
  */
 
+/* Stop mysql wanting to use long long */
+#define NO_CLIENT_LONG_LONG
+
 #include "inspircd.h"
 #include <mysql.h>
 #include <pthread.h>
@@ -25,7 +28,6 @@
 /* $CompileFlags: exec("mysql_config --include") */
 /* $LinkerFlags: exec("mysql_config --libs_r") rpath("mysql_config --libs_r") */
 /* $ModDep: m_sqlv2.h */
-/* $NoPedantic */
 
 /* THE NONBLOCKING MYSQL API!
  * 
@@ -543,7 +545,7 @@ void ConnectDatabases(InspIRCd* ServerInstance)
                {
                        /* XXX: MUTEX */
                        pthread_mutex_lock(&logging_mutex);
-                       ServerInstance->Log(DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
+                       ServerInstance->Logs->Log("m_mysql",DEFAULT,"SQL: Failed to connect database "+i->second->GetHost()+": Error: "+i->second->GetError());
                        i->second->SetEnable(false);
                        pthread_mutex_unlock(&logging_mutex);
                }
@@ -742,7 +744,7 @@ class ModuleSQL : public Module
                        rc = pthread_join(Dispatcher, &status);
                        if (rc)
                        {
-                               ServerInstance->Log(DEFAULT,"SQL: Error code from pthread_join() is " + rc);
+                               ServerInstance->Logs->Log("m_mysql",DEFAULT,"SQL: Error code from pthread_join() is %d", rc);
                        }
                        throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
                }
@@ -760,7 +762,7 @@ class ModuleSQL : public Module
                rc = pthread_join(Dispatcher, &status);
                if (rc)
                {
-                       ServerInstance->Log(DEFAULT,"SQL: Error code from pthread_join() is " + rc);
+                       ServerInstance->Logs->Log("m_mysql",DEFAULT,"SQL: Error code from pthread_join() is %d", rc);
                }
                ClearAllConnections();
                delete Conf;
@@ -818,7 +820,7 @@ class ModuleSQL : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+               return Version(1,2,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
        }
        
 };