diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 16:27:33 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 16:27:33 +0100 |
| commit | b90ff5340fc10a9306be1b1201612e382b8ab051 (patch) | |
| tree | 39a2faeb08864430d60c6db17a918a9ee3102fed /include | |
| parent | 704b4845aa9ce51a6c5a9f5f42265e376db0dfb3 (diff) | |
| download | mariadb-git-b90ff5340fc10a9306be1b1201612e382b8ab051.tar.gz | |
Fixing problems of previous 5.1-main->5.1-maria merge:
- adding back Serg's "mtr --list-options"
- safe_mutex deadlock detector started raising wrong deadlock warnings, fixed
here by a backport from 6.0-main.
include/my_pthread.h:
Porting changes done to 6.0-main which satisfy the safe_mutex deadlock detector (those
in 5.1-main don't), see chad@mysql.com-20090126155607-n0j3zbmgbfepnmmo for explanations
mysql-test/mysql-test-run.pl:
adding back Serg's --list-options
mysys/my_init.c:
Porting changes done to 6.0-main which satisfy the safe_mutex deadlock detector (those
in 5.1-main don't), see chad@mysql.com-20090126155607-n0j3zbmgbfepnmmo for explanations
mysys/my_thr_init.c:
Porting changes done to 6.0-main which satisfy the safe_mutex deadlock detector (those
in 5.1-main don't), see chad@mysql.com-20090126155607-n0j3zbmgbfepnmmo for explanations
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_pthread.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 538457a523a..f7d81f95107 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -671,6 +671,7 @@ extern pthread_mutexattr_t my_errorcheck_mutexattr; typedef ulong my_thread_id; +extern void my_threadattr_global_init(void); extern my_bool my_thread_global_init(void); extern void my_thread_global_end(void); extern my_bool my_thread_init(void); |