diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-04-19 17:23:41 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-04-19 17:23:41 -0400 |
| commit | 04ade50c2152f6ee47e3dd21673205ef11d4d409 (patch) | |
| tree | 7c2691714d17c2113211e16a04453d40532f8692 | |
| parent | 45f710a9d02af31c69d551beca8ab9720b9b5d94 (diff) | |
| parent | 0732ad9a3d2d7c833d638acf395cf364bded90ad (diff) | |
| download | mariadb-git-04ade50c2152f6ee47e3dd21673205ef11d4d409.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
mysys/my_thr_init.c:
Auto merged
| -rw-r--r-- | mysys/my_thr_init.c | 5 |
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; } |