Added support for Mac OS X and building with clang (bug 5601, r=dvander).

2013-02-13 01:14:37 -06:00
parent b0fe6c83e2
commit 40c1fee55a
191 changed files with 3835 additions and 1946 deletions
--- a/dlls/mysqlx/threading.cpp
+++ b/dlls/mysqlx/threading.cpp
@@ -134,7 +134,7 @@ void MysqlThread::SetInfo(const char *host, const char *user, const char *pass,
 	m_user.assign(user);
 	m_pass.assign(pass);
 	m_db.assign(db);
-	m_max_timeout = m_max_timeout;
+	m_max_timeout = max_timeout;
 	m_port = port;
 	m_qrInfo.queue_time = gpGlobals->time;
 }