diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-12 23:54:22 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-12 23:54:22 +0300 |
| commit | c88dd9b291cf7fe9086102d74d255f4b880d1486 (patch) | |
| tree | a1113c56652cc8609f61548a39b493926e4d06ad /sql/net_serv.cc | |
| parent | 93a15f452eb08eab559b12b1947cfae71fc628f5 (diff) | |
| parent | 76989cf55c016a9d8619f582f753444241a4d934 (diff) | |
| download | mariadb-git-c88dd9b291cf7fe9086102d74d255f4b880d1486.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index c9bfd977e78..4d4603ed586 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -277,7 +277,7 @@ net_real_write(NET *net,const char *packet,ulong len) int length; char *pos,*end; thr_alarm_t alarmed; -#if !defined(__WIN__) && !defined(__EMX__) && !defined(OS2) +#if !defined(__WIN__) ALARM alarm_buff; #endif uint retry_count=0; @@ -372,7 +372,7 @@ net_real_write(NET *net,const char *packet,ulong len) #endif /* EXTRA_DEBUG */ } #if defined(THREAD_SAFE_CLIENT) && !defined(MYSQL_SERVER) - if (vio_errno(net->vio) == EINTR) + if (vio_errno(net->vio) == SOCKET_EINTR) { DBUG_PRINT("warning",("Interrupted write. Retrying...")); continue; |