Rebase resync

This commit is contained in:
Antz 2020-02-17 09:19:44 +00:00
parent a0797532e8
commit 1997c1e903
3106 changed files with 11118 additions and 627576 deletions

View file

@ -1,4 +1,4 @@
/*
/**
* This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
*
* This program is free software; you can redistribute it and/or modify
@ -19,7 +19,7 @@
#ifndef DO_POSTGRESQL
#include "Util.h"
#include "Policies/SingletonImp.h"
#include "Policies/Singleton.h"
#include "Platform/Define.h"
#include "Threading.h"
#include "DatabaseEnv.h"
@ -313,7 +313,6 @@ SqlPreparedStatement* MySQLConnection::CreateStatement(const std::string& fmt)
return new MySqlPreparedStatement(fmt, *this, mMysql);
}
//////////////////////////////////////////////////////////////////////////
MySqlPreparedStatement::MySqlPreparedStatement(const std::string& fmt, SqlConnection& conn, MYSQL* mysql) : SqlPreparedStatement(fmt, conn),
m_pMySQLConn(mysql), m_stmt(NULL), m_pInputArgs(NULL), m_pResult(NULL), m_pResultMetadata(NULL)