diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/thr_alarm.h | 6 | ||||
| -rw-r--r-- | include/violite.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/thr_alarm.h b/include/thr_alarm.h index f4823b618f7..66e344d10fd 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -40,7 +40,11 @@ typedef struct st_alarm_info } ALARM_INFO; void thr_alarm_info(ALARM_INFO *info); +extern my_bool my_disable_thr_alarm; +#ifdef _WIN32 +#define DONT_USE_THR_ALARM +#endif #if defined(DONT_USE_THR_ALARM) #define USE_ALARM_THREAD @@ -88,7 +92,7 @@ typedef struct st_alarm { extern uint thr_client_alarm; extern pthread_t alarm_thread; -extern my_bool my_disable_thr_alarm; + #define thr_alarm_init(A) (*(A))=0 #define thr_alarm_in_use(A) (*(A)!= 0) diff --git a/include/violite.h b/include/violite.h index ba057028ed2..05b20245c5a 100644 --- a/include/violite.h +++ b/include/violite.h @@ -168,6 +168,7 @@ void vio_end(void); #define vio_should_retry(vio) (vio)->should_retry(vio) #define vio_was_interrupted(vio) (vio)->was_interrupted(vio) #define vio_close(vio) ((vio)->vioclose)(vio) +#define vio_shutdown(vio,how) ((vio)->shutdown)(vio,how) #define vio_peer_addr(vio, buf, prt, buflen) (vio)->peer_addr(vio, buf, prt, buflen) #define vio_timeout(vio, which, seconds) (vio)->timeout(vio, which, seconds) #define vio_poll_read(vio, timeout) (vio)->poll_read(vio, timeout) @@ -219,6 +220,7 @@ struct st_vio void (*timeout)(Vio*, unsigned int which, unsigned int timeout); my_bool (*poll_read)(Vio *vio, uint timeout); my_bool (*is_connected)(Vio*); + int (*shutdown)(Vio *, int); my_bool (*has_data) (Vio*); #ifdef HAVE_OPENSSL void *ssl_arg; @@ -235,6 +237,7 @@ struct st_vio char *shared_memory_pos; #endif /* HAVE_SMEM */ #ifdef _WIN32 + DWORD thread_id; /* Used to XP only in vio_shutdown */ OVERLAPPED pipe_overlapped; DWORD read_timeout_ms; DWORD write_timeout_ms; |