diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-02 14:12:48 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-02 14:12:48 +0100 |
| commit | b873156c3c1654553319158275f29ac2f818f3ce (patch) | |
| tree | 204be4b38ee32328a980fe65b46e41336c5a38e8 /src/server/shared/Database/MySQLConnection.h | |
| parent | 05efdaf39349f057eabf58252532dff76511e7ef (diff) | |
| parent | ebd14b4f01cc64a2a488bdbb1046897cc4da8e9a (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.h
Diffstat (limited to 'src/server/shared/Database/MySQLConnection.h')
| -rw-r--r-- | src/server/shared/Database/MySQLConnection.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/server/shared/Database/MySQLConnection.h b/src/server/shared/Database/MySQLConnection.h index 2b1ccf7df4d..989c447fcd5 100644 --- a/src/server/shared/Database/MySQLConnection.h +++ b/src/server/shared/Database/MySQLConnection.h @@ -62,9 +62,7 @@ struct MySQLConnectionInfo std::string port_or_socket; }; -typedef std::map<uint32 /*index*/, std::pair<const char* /*query*/, ConnectionFlags /*sync/async*/> > PreparedStatementMap; - -#define PREPARE_STATEMENT(a, b, c) m_queries[a] = std::make_pair(strdup(b), c); +typedef std::map<uint32 /*index*/, std::pair<std::string /*query*/, ConnectionFlags /*sync/async*/> > PreparedStatementMap; class MySQLConnection { |