diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-15 18:08:03 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-15 18:08:03 +0200 |
| commit | d0a8a6285dd7eb9b6d28761f05bfe0546981de93 (patch) | |
| tree | f5f78c3be6ac2df0570bb8930c21c6bdc5b6490b | |
| parent | 39f28ab6c5c92eca8761359835acd81b5fb73a6f (diff) | |
| parent | b679097468e75cab8acc8de81089914f8afb5498 (diff) | |
| download | mariadb-git-d0a8a6285dd7eb9b6d28761f05bfe0546981de93.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-maint
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
| -rw-r--r-- | include/my_net.h | 8 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/my_net.h b/include/my_net.h index b26e525016b..678025b31f4 100644 --- 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 /* diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 6d58f1a22f9..04990a10347 100644 --- 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 |