summaryrefslogtreecommitdiff
path: root/innobase/os/os0thread.c
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-05-26 19:12:49 +0300
committerunknown <monty@mysql.com>2004-05-26 19:12:49 +0300
commit30bffb0213dbc5b52823b167de71dd96aff1bf16 (patch)
tree45397c78051c557e55bc9b5df93c68604da6a451 /innobase/os/os0thread.c
parent1d482780b0da780a02067735cff8cd8f555236e9 (diff)
downloadmariadb-git-30bffb0213dbc5b52823b167de71dd96aff1bf16.tar.gz
Changed prototype of killed_ptr() to make it more portable
Applied patches for Netware innobase/include/os0thread.h: Applied patches for Netware innobase/os/os0thread.c: Applied patches for Netware libmysql/libmysql.c: Applied patches for Netware libmysql/libmysql.def: Applied patches for Netware myisam/myisamchk.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable myisam/myisamdef.h: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable mysql-test/t/rpl_relayspace-slave.opt: Applied patches for Netware mysys/my_pthread.c: Applied patches for Netware mysys/my_static.h: Portability fix netware/BUILD/compile-linux-tools: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/mwenv: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/BUILD/nwbootstrap: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/my_manage.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_fix_privilege_tables.pl: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/mysql_test_run.c: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable netware/static_init_db.sql: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable scripts/make_binary_distribution.sh: Applied patches for Netware Changed prototype of killed_ptr() to make it more portable sql/filesort.cc: Changed prototype of killed_ptr() to make it more portable sql/ha_myisam.cc: Changed prototype of killed_ptr() to make it more portable sql/mysqld.cc: Fixed some typos for Netware sql/sql_bitmap.h: Applied patches for Netware sql/sql_class.h: Changed prototype of killed_ptr() to make it more portable sql/sql_insert.cc: safety fix strings/my_strtoll10.c: Added comment
Diffstat (limited to 'innobase/os/os0thread.c')
-rw-r--r--innobase/os/os0thread.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c
index 59d0fdbd8c9..8deb8f38b5d 100644
--- a/innobase/os/os0thread.c
+++ b/innobase/os/os0thread.c
@@ -201,6 +201,13 @@ os_thread_exit(
#endif
}
+int
+os_thread_join(
+/*=============*/
+ os_thread_id_t thread_id) /* in: id of the thread to join */
+{
+ return pthread_join(thread_id, NULL);
+}
/*********************************************************************
Returns handle to the current thread. */