diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-24 19:18:22 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-01-24 19:18:22 +0100 |
| commit | 398c935db30f934cd231fb5566a2bce7917a621c (patch) | |
| tree | ab7ae524a0c8d44114fe2bcdb821bc6959bf853a /include | |
| parent | d50649ecf787d4adf80544e892a00a709db37f32 (diff) | |
| download | mariadb-git-398c935db30f934cd231fb5566a2bce7917a621c.tar.gz | |
further reduce diffs to 5.5, monty review
Diffstat (limited to 'include')
| -rw-r--r-- | include/thr_alarm.h | 1 | ||||
| -rw-r--r-- | include/violite.h | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/thr_alarm.h b/include/thr_alarm.h index 66e344d10fd..8de70d4cdb8 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -93,7 +93,6 @@ typedef struct st_alarm { extern uint thr_client_alarm; extern pthread_t alarm_thread; - #define thr_alarm_init(A) (*(A))=0 #define thr_alarm_in_use(A) (*(A)!= 0) void init_thr_alarm(uint max_alarm); diff --git a/include/violite.h b/include/violite.h index 05b20245c5a..f28f72662ff 100644 --- a/include/violite.h +++ b/include/violite.h @@ -175,6 +175,17 @@ void vio_end(void); #define vio_is_connected(vio) (vio)->is_connected(vio) #endif /* !defined(DONT_MAP_VIO) */ +#ifdef _WIN32 +/* + Set thread id for io cancellation (required on Windows XP only, + and should to be removed if XP is no more supported) +*/ + +#define vio_set_thread_id(vio, tid) if(vio) vio->thread_id= tid +#else +#define vio_set_thread_id(vio, tid) +#endif + /* This enumerator is used in parser - should be always visible */ enum SSL_type { @@ -237,7 +248,7 @@ struct st_vio char *shared_memory_pos; #endif /* HAVE_SMEM */ #ifdef _WIN32 - DWORD thread_id; /* Used to XP only in vio_shutdown */ + DWORD thread_id; /* Used on XP only by vio_shutdown() */ OVERLAPPED pipe_overlapped; DWORD read_timeout_ms; DWORD write_timeout_ms; |