mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/mydev/mysql-5.0

Browse source 
into  mysql.com:/home/mydev/mysql-5.0-bug8841
This commit is contained in:
unknown 2006-02-16 10:31:32 +01:00
commit 920b9275bb
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mysys/thr_mutex.c
View file

@ -103,7 +103,7 @@ int safe_mutex_lock(safe_mutex_t *mp,const char *file, uint line)
fflush(stderr); fflush(stderr);
abort(); abort();
} }
pthread_mutex_lock(&mp->global); pthread_mutex_lock(&mp->global);
if (mp->count > 0 && pthread_equal(pthread_self(),mp->thread)) if (mp->count > 0 && pthread_equal(pthread_self(),mp->thread))
{ {
@ -121,6 +121,7 @@ int safe_mutex_lock(safe_mutex_t *mp,const char *file, uint line)
fflush(stderr); fflush(stderr);
abort(); abort();
} }
mp->thread= pthread_self();
if (mp->count++) if (mp->count++)
{ {
fprintf(stderr,"safe_mutex: Error in thread libray: Got mutex at %s, \ fprintf(stderr,"safe_mutex: Error in thread libray: Got mutex at %s, \
@ -128,7 +129,6 @@ line %d more than 1 time\n", file,line);
fflush(stderr); fflush(stderr);
abort(); abort();
} }
mp->thread=pthread_self();
mp->file= file; mp->file= file;
mp->line=line; mp->line=line;
pthread_mutex_unlock(&mp->global); pthread_mutex_unlock(&mp->global);
@ -154,6 +154,7 @@ int safe_mutex_unlock(safe_mutex_t *mp,const char *file, uint line)
fflush(stderr); fflush(stderr);
abort(); abort();
} }
mp->thread= 0;
mp->count--; mp->count--;
#ifdef __WIN__ #ifdef __WIN__
pthread_mutex_unlock(&mp->mutex); pthread_mutex_unlock(&mp->mutex);
@ -207,6 +208,7 @@ int safe_cond_wait(pthread_cond_t *cond, safe_mutex_t *mp, const char *file,
fflush(stderr); fflush(stderr);
abort(); abort();
} }
mp->thread=pthread_self();
if (mp->count++) if (mp->count++)
{ {
fprintf(stderr, fprintf(stderr,
@ -215,7 +217,6 @@ int safe_cond_wait(pthread_cond_t *cond, safe_mutex_t *mp, const char *file,
fflush(stderr); fflush(stderr);
abort(); abort();
} }
mp->thread=pthread_self();
mp->file= file; mp->file= file;
mp->line=line; mp->line=line;
pthread_mutex_unlock(&mp->global); pthread_mutex_unlock(&mp->global);
@ -245,6 +246,7 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,
} }
#endif #endif
pthread_mutex_lock(&mp->global); pthread_mutex_lock(&mp->global);
mp->thread=pthread_self();
if (mp->count++) if (mp->count++)
{ {
fprintf(stderr, fprintf(stderr,
@ -253,7 +255,6 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,
fflush(stderr); fflush(stderr);
abort(); abort();
} }
mp->thread=pthread_self();
mp->file= file; mp->file= file;
mp->line=line; mp->line=line;
pthread_mutex_unlock(&mp->global); pthread_mutex_unlock(&mp->global);