summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-01 10:38:16 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-01 10:38:16 +0300
commit9591abbd399bb4b85db9da458fba5ed972c97afa (patch)
treec8989889543a2c502ec6a75d58738675ffac837c /include
parent4295917682a23b6f8d493d9433b0b7c1f244c421 (diff)
downloadmariadb-git-9591abbd399bb4b85db9da458fba5ed972c97afa.tar.gz
Make killing of threads safer
Docs/manual.texi: Changelog sql/sql_insert.cc: Fix problem with INSERT DELAYED during shutdown
Diffstat (limited to 'include')
-rw-r--r--include/my_pthread.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 79baa7a53e3..33ad9ec0401 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -575,12 +575,14 @@ extern int pthread_dummy(int);
struct st_my_thread_var
{
int thr_errno;
- pthread_cond_t suspend, *current_cond;
- pthread_mutex_t mutex, *current_mutex;
+ pthread_cond_t suspend;
+ pthread_mutex_t mutex;
+ pthread_mutex_t * volatile current_mutex;
+ pthread_cond_t * volatile current_cond;
pthread_t pthread_self;
long id;
int cmp_length;
- volatile int abort;
+ int volatile abort;
#ifndef DBUG_OFF
gptr dbug;
char name[THREAD_NAME_SIZE+1];