Merge bk-internal:/home/bk/mysql-5.1-maint

into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint

Merge bk-internal:/home/bk/mysql-5.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
a29f9c3b · msvensson@shellback.(none) · 895bf055 · c6df1a5c · a29f9c3b · a29f9c3b
Commit a29f9c3b authored Sep 15, 2006 by msvensson@shellback.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

include/my_net.h include/my_net.h +8 -0

mysql-test/t/disabled.def mysql-test/t/disabled.def +0 -2

No files found.
--- a/include/my_net.h
+++ b/include/my_net.h
@@ -55,6 +55,14 @@ C_MODE_START

 #if defined(__WIN__)
 #define O_NONBLOCK 1    /* For emulation of fcntl() */
+
+/*
+  SHUT_RDWR is called SD_BOTH in windows and
+  is defined to 2 in winsock2.h
+  #define SD_BOTH 0x02
+*/
+#define SHUT_RDWR 0x02
+
 #endif

 /*

--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -41,7 +41,5 @@ rpl_sp_effects           : BUG#19862 2006-06-15 mkindahl
 #rpl_truncate_7ndb        : BUG#21298 2006-07-27 msvensson
 crash_commit_before      : 2006-08-02 msvensson
 rpl_ndb_dd_advance       : BUG#18679 2006-07-28 jimw (Test fails randomly)
-func_group               : BUG#21924 2006-08-30 reggie
-func_in                  : BUG#21925 2006-08-30 reggie
 ndb_binlog_discover      : bug#21806 2006-08-24
 ndb_autodiscover3        : bug#21806