diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-27 01:20:56 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-27 01:20:56 +0200 |
| commit | 52a4c5a10063f2e7b06a32add3b87ba0b0ae2b45 (patch) | |
| tree | bf79d814679a767435990f41e226728ee5927766 /sql/net_serv.cc | |
| parent | 002b51000fcec9ff8c45afe12ddd3728f6035ff0 (diff) | |
| download | mariadb-git-52a4c5a10063f2e7b06a32add3b87ba0b0ae2b45.tar.gz | |
Portability fixes for OPENBSD, OS2 and Windows
Docs/manual.texi:
Changed TCX -> MySQL AB
configure.in:
New version
include/my_sys.h:
Fixes for OS2
ltconfig:
Fixes for OS2
ltmain.sh:
Fixes for OS2
mit-pthreads/net/net_internal.h:
Fixes for OPENBSD
mit-pthreads/net/proto_internal.h:
Fixes for OPENBSD
mit-pthreads/net/res_internal.h:
Fixes for OPENBSD
mit-pthreads/net/serv_internal.h:
Fixes for OPENBSD
myisammrg/myrg_open.c:
MERGE didn't work on Windows
mysys/my_getwd.c:
Fixes for OS2
sql/field.cc:
cleanup
sql/field.h:
Fix for new SCO compiler
sql/ha_berkeley.cc:
Cleanup
sql/ha_berkeley.h:
Portability fix
sql/item_sum.h:
Fix for new SCO compiler
sql/log.cc:
Fixes for OS2
sql/log_event.h:
Fixes for OS2
sql/mysqld.cc:
Fixes for OS2
sql/net_serv.cc:
Fixes for OS2
sql/sql_analyse.h:
Fix for new SCO compiler
sql/sql_class.h:
Fix for new SCO compiler
sql/sql_map.h:
Fix for new SCO compiler
sql/sql_repl.cc:
cleanup
sql/sql_string.h:
Fix for new SCO compiler
sql/sql_table.cc:
cleanup
strings/longlong2str-x86.s:
Fixes for openbsd
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 5e7abd5d9a7..4c4642034e1 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -271,7 +271,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__) +#if !defined(__WIN__) ALARM alarm_buff; #endif uint retry_count=0; @@ -426,7 +426,7 @@ static void my_net_skip_rest(NET *net, ulong remain, thr_alarm_t *alarmed) if ((int) (length=vio_read(net->vio,(char*) net->buff,remain)) <= 0L) { my_bool interrupted = vio_should_retry(net->vio); - if (!thr_got_alarm(&alarmed) && interrupted) + if (!thr_got_alarm(alarmed) && interrupted) { /* Probably in MIT threads */ if (retry_count++ < RETRY_COUNT) continue; |