aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Database
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2013-05-17 20:39:53 +0200
committerShauren <shauren.trinity@gmail.com>2013-05-17 20:39:53 +0200
commit8be181c7e60daf9833044da61b379c2136892c37 (patch)
treedcfd8642d49b8e6b43911dab3ab9a98de674db73 /src/server/shared/Database
parent4f43584af86828646e6188b58b2194895455e62b (diff)
Core/Misc: Fixed a bunch of issues found by static analysis
Diffstat (limited to 'src/server/shared/Database')
-rw-r--r--src/server/shared/Database/Field.cpp1
-rw-r--r--src/server/shared/Database/MySQLConnection.cpp2
-rw-r--r--src/server/shared/Database/PreparedStatement.cpp1
3 files changed, 4 insertions, 0 deletions
diff --git a/src/server/shared/Database/Field.cpp b/src/server/shared/Database/Field.cpp
index 9bd37641813..51d918e716e 100644
--- a/src/server/shared/Database/Field.cpp
+++ b/src/server/shared/Database/Field.cpp
@@ -22,6 +22,7 @@ Field::Field()
data.value = NULL;
data.type = MYSQL_TYPE_NULL;
data.length = 0;
+ data.raw = false;
}
Field::~Field()
diff --git a/src/server/shared/Database/MySQLConnection.cpp b/src/server/shared/Database/MySQLConnection.cpp
index 846c8ce72fe..19d0a7af4c8 100644
--- a/src/server/shared/Database/MySQLConnection.cpp
+++ b/src/server/shared/Database/MySQLConnection.cpp
@@ -84,8 +84,10 @@ bool MySQLConnection::Open()
int port;
char const* unix_socket;
+ unsigned int timeout = 10;
mysql_options(mysqlInit, MYSQL_SET_CHARSET_NAME, "utf8");
+ mysql_options(mysqlInit, MYSQL_OPT_READ_TIMEOUT, (char const*)&timeout);
#ifdef _WIN32
if (m_connectionInfo.host == ".") // named pipe use option (Windows)
{
diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp
index 06f9ff51132..24097ca41c5 100644
--- a/src/server/shared/Database/PreparedStatement.cpp
+++ b/src/server/shared/Database/PreparedStatement.cpp
@@ -203,6 +203,7 @@ void PreparedStatement::setNull(const uint8 index)
}
MySQLPreparedStatement::MySQLPreparedStatement(MYSQL_STMT* stmt) :
+m_stmt(NULL),
m_Mstmt(stmt),
m_bind(NULL)
{