diff options
| author | vicentiu <vicentiu@mariadb.org> | 2017-01-07 14:24:42 +0200 |
|---|---|---|
| committer | vicentiu <vicentiu@mariadb.org> | 2017-01-07 14:24:42 +0200 |
| commit | 6ac84d9824ec384c4489b68b8087369aef147ff9 (patch) | |
| tree | deafbc4350d719a804056a9355b63297bfee517d /storage/innobase/include | |
| parent | 31d8c9221fb9451c4e269be7b0d4d26a882e730e (diff) | |
| download | mariadb-git-6ac84d9824ec384c4489b68b8087369aef147ff9.tar.gz | |
5.6.35
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/os0thread.h | 13 | ||||
| -rw-r--r-- | storage/innobase/include/srv0srv.h | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/storage/innobase/include/os0thread.h b/storage/innobase/include/os0thread.h index 9a1ada8fa0d..54f3d7554bf 100644 --- a/storage/innobase/include/os0thread.h +++ b/storage/innobase/include/os0thread.h @@ -117,14 +117,25 @@ os_thread_create_func( os_thread_id_t* thread_id); /*!< out: id of the created thread, or NULL */ +/** Waits until the specified thread completes and joins it. +Its return value is ignored. +@param[in,out] thread thread to join */ +UNIV_INTERN +void +os_thread_join( + os_thread_t thread); + /*****************************************************************//** Exits the current thread. */ UNIV_INTERN void os_thread_exit( /*===========*/ - void* exit_value) /*!< in: exit value; in Windows this void* + void* exit_value, /*!< in: exit value; in Windows this void* is cast as a DWORD */ + bool detach = true) /*!< in: if true, the thread will be detached + right before exiting. If false, another thread + is responsible for joining this thread. */ UNIV_COLD MY_ATTRIBUTE((noreturn)); /*****************************************************************//** Returns the thread identifier of current thread. diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index aaea21b264b..042ced75d10 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -347,6 +347,7 @@ extern unsigned long long srv_stats_transient_sample_pages; extern my_bool srv_stats_persistent; extern unsigned long long srv_stats_persistent_sample_pages; extern my_bool srv_stats_auto_recalc; +extern my_bool srv_stats_include_delete_marked; extern ibool srv_use_doublewrite_buf; extern ulong srv_doublewrite_batch_size; |