diff options
author | unknown <cmiller@zippy.cornsilk.net> | 2007-04-20 13:52:57 -0400 |
---|---|---|
committer | unknown <cmiller@zippy.cornsilk.net> | 2007-04-20 13:52:57 -0400 |
commit | d8262276e1098611094df951591b037c46e3bd53 (patch) | |
tree | 5df5cee82545df0a66b3009aea443c97a4606933 /mysys/my_thr_init.c | |
parent | 4d0fad47ad73ff05a77d88167b7346de0e50a240 (diff) | |
parent | 1c04850b95b1e660b0d4715d810549c120e8a338 (diff) | |
download | mariadb-git-d8262276e1098611094df951591b037c46e3bd53.tar.gz |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
mysys/my_thr_init.c:
Auto merged
Diffstat (limited to 'mysys/my_thr_init.c')
-rw-r--r-- | mysys/my_thr_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c index 8179af2ea3e..79a28ef04b0 100644 --- a/mysys/my_thr_init.c +++ b/mysys/my_thr_init.c @@ -82,9 +82,9 @@ my_bool my_thread_global_init(void) int pth_ret; thd_lib_detected= get_thread_lib(); - if (pth_ret= pthread_key_create(&THR_KEY_mysys, NULL)) + if ((pth_ret= pthread_key_create(&THR_KEY_mysys, NULL)) != 0) { - fprintf(stderr,"Can't initialize threads: pthread error %d\n", pth_ret); + fprintf(stderr,"Can't initialize threads: error %d\n", pth_ret); return 1; } |