summaryrefslogtreecommitdiff
path: root/mysys/my_thr_init.c
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-04-19 17:23:41 -0400
committercmiller@zippy.cornsilk.net <>2007-04-19 17:23:41 -0400
commitdfdc475a579e7448b68c36c4cb3d43a16fd121cb (patch)
tree7c2691714d17c2113211e16a04453d40532f8692 /mysys/my_thr_init.c
parent4702afda850326f57174dd16d37f5c92396143c5 (diff)
parent28b3218e453f6c173f76f86beec5a4f328b12bfd (diff)
downloadmariadb-git-dfdc475a579e7448b68c36c4cb3d43a16fd121cb.tar.gz
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint--pthreadkeycreate
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
Diffstat (limited to 'mysys/my_thr_init.c')
-rw-r--r--mysys/my_thr_init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c
index 75da07390ba..8179af2ea3e 100644
--- a/mysys/my_thr_init.c
+++ b/mysys/my_thr_init.c
@@ -79,11 +79,12 @@ static uint get_thread_lib(void);
my_bool my_thread_global_init(void)
{
+ int pth_ret;
thd_lib_detected= get_thread_lib();
- if (pthread_key_create(&THR_KEY_mysys,0))
+ if (pth_ret= pthread_key_create(&THR_KEY_mysys, NULL))
{
- fprintf(stderr,"Can't initialize threads: error %d\n",errno);
+ fprintf(stderr,"Can't initialize threads: pthread error %d\n", pth_ret);
return 1;
}