summaryrefslogtreecommitdiff
path: root/mysys/my_thr_init.c
diff options
context:
space:
mode:
authorcmiller@zippy.cornsilk.net <>2007-04-20 13:52:57 -0400
committercmiller@zippy.cornsilk.net <>2007-04-20 13:52:57 -0400
commitbd31322626a2bfd3c007f08af4292d103f9c63d4 (patch)
tree5df5cee82545df0a66b3009aea443c97a4606933 /mysys/my_thr_init.c
parenta581ad07eaa8dff799776562efa6385ffa2aeb59 (diff)
parent0b69216315f5d6a43b17a1abb411234a78712e1e (diff)
downloadmariadb-git-bd31322626a2bfd3c007f08af4292d103f9c63d4.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
Diffstat (limited to 'mysys/my_thr_init.c')
-rw-r--r--mysys/my_thr_init.c4
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;
}