summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-11-22 03:21:40 +0200
committermonty@mysql.com <>2003-11-22 03:21:40 +0200
commitd87494c5acf1b0e03cb3848b3e588c1d0259b44f (patch)
treef843dfed18127f94f90e6cffa6456e545f7b6b57 /sql-common
parentd08945498e44acb968d1aab6d269d9b1874246e6 (diff)
downloadmariadb-git-d87494c5acf1b0e03cb3848b3e588c1d0259b44f.tar.gz
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
Updated project files for windows Made rpl_change_master.test portable Ensure that mutex are not freed if not initilized
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index cb0d8230eb8..878a8beacba 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -55,12 +55,6 @@ my_bool net_flush(NET *net);
#else /*EMBEDDED_LIBRARY*/
#define CLI_MYSQL_REAL_CONNECT mysql_real_connect
#endif /*EMBEDDED_LIBRARY*/
-
-#if !defined(MYSQL_SERVER) && (defined(__WIN__) || defined(_WIN32) || defined(_WIN64))
-
-#include <winsock.h>
-#include <odbcinst.h>
-#endif /* !defined(MYSQL_SERVER) && (defined(__WIN__) ... */
#include <my_sys.h>
#include <mysys_err.h>
#include <m_string.h>