Commit e9b6c1dd authored by unknown's avatar unknown

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
parents 65824998 4c865ebc
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment