* Huge merge with original branch

--HG--
branch : trunk

1 files changed, 79 insertions, 79 deletions

diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index 3d8b92eb842..0ef046541b5 100644
--- a/src/shared/Database/DatabaseMysql.h
+++ b/src/shared/Database/DatabaseMysql.h
@@ -1,79 +1,79 @@
-/* 
- * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
- *
- * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef DO_POSTGRESQL
-
-#ifndef _DATABASEMYSQL_H
-#define _DATABASEMYSQL_H
-
-#include "Database.h"
-#include "Policies/Singleton.h"
-#include "zthread/FastMutex.h"
-
-#ifdef WIN32
-#define FD_SETSIZE 1024
-#include <winsock2.h>
-#include <mysql/mysql.h>
-#else
-#include <mysql.h>
-#endif
-
-class TRINITY_DLL_SPEC DatabaseMysql : public Database
-{
-    friend class Trinity::OperatorNew<DatabaseMysql>;
-
-    public:
-        DatabaseMysql();
-        ~DatabaseMysql();
-
-        //! Initializes Mysql and connects to a server.
-        /*! infoString should be formated like hostname;username;password;database. */
-        bool Initialize(const char *infoString);
-        void InitDelayThread();
-        void HaltDelayThread();
-        QueryResult* Query(const char *sql);
-        bool Execute(const char *sql);
-        bool DirectExecute(const char* sql);
-        bool BeginTransaction();
-        bool CommitTransaction();
-        bool RollbackTransaction();
-
-        operator bool () const { return mMysql != NULL; }
-
-        unsigned long escape_string(char *to, const char *from, unsigned long length);
-        using Database::escape_string;
-
-        // must be call before first query in thread
-        void ThreadStart();
-        // must be call before finish thread run
-        void ThreadEnd();
-    private:
-        ZThread::FastMutex mMutex;
-
-        ZThread::ThreadImpl* tranThread;
-
-        MYSQL *mMysql;
-
-        static size_t db_count;
-
-        bool _TransactionCmd(const char *sql);
-};
-#endif
-#endif
+/*

+ * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>

+ *

+ * Copyright (C) 2008-2009 Trinity <http://www.trinitycore.org/>

+ *

+ * This program is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ */

+

+#ifndef DO_POSTGRESQL

+

+#ifndef _DATABASEMYSQL_H

+#define _DATABASEMYSQL_H

+

+#include "Database.h"

+#include "Policies/Singleton.h"

+#include "zthread/FastMutex.h"

+

+#ifdef WIN32

+#define FD_SETSIZE 1024

+#include <winsock2.h>

+#include <mysql/mysql.h>

+#else

+#include <mysql.h>

+#endif

+

+class TRINITY_DLL_SPEC DatabaseMysql : public Database

+{

+    friend class Trinity::OperatorNew<DatabaseMysql>;

+

+    public:

+        DatabaseMysql();

+        ~DatabaseMysql();

+

+        //! Initializes Mysql and connects to a server.

+        /*! infoString should be formated like hostname;username;password;database. */

+        bool Initialize(const char *infoString);

+        void InitDelayThread();

+        void HaltDelayThread();

+        QueryResult* Query(const char *sql);

+        bool Execute(const char *sql);

+        bool DirectExecute(const char* sql);

+        bool BeginTransaction();

+        bool CommitTransaction();

+        bool RollbackTransaction();

+

+        operator bool () const { return mMysql != NULL; }

+

+        unsigned long escape_string(char *to, const char *from, unsigned long length);

+        using Database::escape_string;

+

+        // must be call before first query in thread

+        void ThreadStart();

+        // must be call before finish thread run

+        void ThreadEnd();

+    private:

+        ZThread::FastMutex mMutex;

+

+        ZThread::ThreadImpl* tranThread;

+

+        MYSQL *mMysql;

+

+        static size_t db_count;

+

+        bool _TransactionCmd(const char *sql);

+};

+#endif

+#endif