summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8>2009-03-30 23:01:58 +0000
committeradustman <adustman@9fc6cd9a-920d-0410-adcf-ac96716ed7e8>2009-03-30 23:01:58 +0000
commitf19386dd831ec102476d0d990d97f459470a4d93 (patch)
treeb2ed1fe5d94a0aedb4edbf56edc1ccc3dc0236e1
parent91de6b7b7042c78d5bc860174e298e1bce73b64c (diff)
downloadmysqldb1-f19386dd831ec102476d0d990d97f459470a4d93.tar.gz
-rw-r--r--MySQLdb/_mysql.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/MySQLdb/_mysql.c b/MySQLdb/_mysql.c
index 6fcc141..1683c1d 100644
--- a/MySQLdb/_mysql.c
+++ b/MySQLdb/_mysql.c
@@ -28,7 +28,8 @@ PERFORMANCE OF THIS SOFTWARE.
#include "pymemcompat.h"
#include "structmember.h"
-#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32) || defined(MS_WIN32)
+#if defined(MS_WINDOWS)
+#include <winsock2.h>
#include <windows.h>
#include <config-win.h>
#else
@@ -480,7 +481,7 @@ _mysql_ConnectionObject_Initialize(
#endif
char *host = NULL, *user = NULL, *passwd = NULL,
*db = NULL, *unix_socket = NULL;
- unsigned int port = MYSQL_PORT;
+ unsigned int port = 0;
unsigned int client_flag = 0;
static char *kwlist[] = { "host", "user", "passwd", "db", "port",
"unix_socket", "conv",
@@ -508,7 +509,8 @@ _mysql_ConnectionObject_Initialize(
&init_command, &read_default_file,
&read_default_group,
&client_flag, &ssl,
- &local_infile
+ &local_infile /* DO NOT PATCH FOR RECONNECT, IDIOTS
+ IF YOU DO THIS, I WILL NOT SUPPORT YOUR PACKAGES. */
))
return -1;