summaryrefslogtreecommitdiff
path: root/include/my_pthread.h
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2006-11-29 22:14:08 +0200
committerunknown <monty@mysql.com/narttu.mysql.fi>2006-11-29 22:14:08 +0200
commit193e34277e56df9d64afb78e744f008934663a35 (patch)
treebef430d689166e5e66f9ead04d47402e9b5b6b1c /include/my_pthread.h
parent83352bb818f244ab57281b9821b418209069acaa (diff)
downloadmariadb-git-193e34277e56df9d64afb78e744f008934663a35.tar.gz
Ignore some generated files
Don't return from my_thread_global_end() until all threads have called my_thread_end() Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io) BitKeeper/etc/ignore: added *.gcda *.gcno include/my_pthread.h: Added my_thread_end_wait_time Removed not used thread variables mysys/my_thr_init.c: Add thread counters. Don't return from my_thread_global_end() until all threads have called my_thread_end() (Or a timeout (5 seconds) has elapsed) This fixed some valgrind warnings Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io)
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r--include/my_pthread.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index 3e4388413e0..300291610d3 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -677,14 +677,13 @@ struct st_my_thread_var
};
extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));
+extern uint my_thread_end_wait_time;
#define my_thread_var (_my_thread_var())
#define my_errno my_thread_var->thr_errno
/*
Keep track of shutdown,signal, and main threads so that my_end() will not
report errors with them
*/
-extern pthread_t shutdown_th, main_th, signal_th;
-
/* statistics_xxx functions are for not essential statistic */
#ifndef thread_safe_increment