diff options
| -rw-r--r-- | innobase/os/os0thread.c | 2 | ||||
| -rw-r--r-- | myisam/sort.c | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c index 8deb8f38b5d..12a8abf3069 100644 --- a/innobase/os/os0thread.c +++ b/innobase/os/os0thread.c @@ -201,6 +201,7 @@ os_thread_exit( #endif } +#ifdef HAVE_PTHREAD_JOIN int os_thread_join( /*=============*/ @@ -208,6 +209,7 @@ os_thread_join( { return pthread_join(thread_id, NULL); } +#endif /********************************************************************* Returns handle to the current thread. */ diff --git a/myisam/sort.c b/myisam/sort.c index e28df1657a7..509365b89a5 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -852,7 +852,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file, uchar *strpos; BUFFPEK *buffpek,**refpek; QUEUE queue; - volatile bool *killed= killed_ptr(info->sort_info->param); + volatile my_bool *killed= killed_ptr(info->sort_info->param); DBUG_ENTER("merge_buffers"); count=error=0; @@ -873,7 +873,8 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file, count+= buffpek->count; buffpek->base= strpos; buffpek->max_keys=maxcount; - strpos+= (uint) (error=(int) info->read_to_buffer(from_file,buffpek,sort_length)); + strpos+= (uint) (error=(int) info->read_to_buffer(from_file,buffpek, + sort_length)); if (error == -1) goto err; /* purecov: inspected */ queue_insert(&queue,(char*) buffpek); @@ -890,7 +891,8 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file, buffpek=(BUFFPEK*) queue_top(&queue); if (to_file) { - if (info->write_key(info,to_file,(byte*) buffpek->key,(uint) sort_length,1)) + if (info->write_key(info,to_file,(byte*) buffpek->key, + (uint) sort_length,1)) { error=1; goto err; /* purecov: inspected */ } |