diff options
Diffstat (limited to 'storage/innobase/os/os0thread.cc')
| -rw-r--r-- | storage/innobase/os/os0thread.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/storage/innobase/os/os0thread.cc b/storage/innobase/os/os0thread.cc index da2a2f59616..811bd87cef7 100644 --- a/storage/innobase/os/os0thread.cc +++ b/storage/innobase/os/os0thread.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -187,17 +187,12 @@ os_thread_create_func( if (thread_id != NULL) { *thread_id = new_thread_id; } - return((os_thread_t)new_thread_id); } -/*****************************************************************//** -Exits the current thread. */ +/** Exits the current thread. */ void -os_thread_exit( -/*===========*/ - void* exit_value) /*!< in: exit value; in Windows this void* - is cast as a DWORD */ +os_thread_exit() { #ifdef UNIV_DEBUG_THREAD_CREATION ib::info() << "Thread exits, id " @@ -221,11 +216,11 @@ os_thread_exit( mutex_exit(&thread_mutex); - ExitThread((DWORD) exit_value); + ExitThread(0); #else mutex_exit(&thread_mutex); pthread_detach(pthread_self()); - pthread_exit(exit_value); + pthread_exit(NULL); #endif } |