diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-12 23:53:31 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-12 23:53:31 +0300 |
| commit | 76989cf55c016a9d8619f582f753444241a4d934 (patch) | |
| tree | 51a09b9e3466647e4386ab24f3c9aa89ff7a93b9 /libmysql/net.c | |
| parent | a53e8ea0ac4f7d53297b7942febf04e02d8c3b54 (diff) | |
| download | mariadb-git-76989cf55c016a9d8619f582f753444241a4d934.tar.gz | |
OS2 patch
Docs/manual.texi:
Updated section of how to change the socket file.
Changelog for 3.23.43
include/merge.h:
Fixed typo
include/my_pthread.h:
Fixed bug for WIN32
include/myisam.h:
Fixed typo
include/nisam.h:
Fixed typo
sql/handler.h:
Fixed typo
sql/sql_table.cc:
Fixed typo
sql/unireg.cc:
F
Diffstat (limited to 'libmysql/net.c')
| -rw-r--r-- | libmysql/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/net.c b/libmysql/net.c index ba0944a2516..24e4da3561a 100644 --- a/libmysql/net.c +++ b/libmysql/net.c @@ -77,7 +77,7 @@ extern ulong mysqld_net_retry_count; typedef my_bool thr_alarm_t; typedef my_bool ALARM; #define thr_alarm_init(A) (*(A))=0 -#define thr_alarm_in_use(A) (*(A)) +#define thr_alarm_in_use(A) (*(A)!= 0) #define thr_end_alarm(A) #define thr_alarm(A,B,C) local_thr_alarm((A),(B),(C)) inline int local_thr_alarm(my_bool *A,int B __attribute__((unused)),ALARM *C __attribute__((unused))) @@ -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; |