summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-05-27 12:03:16 +0300
committerunknown <monty@mysql.com>2004-05-27 12:03:16 +0300
commit5df707c7c9fe5ac760c7136ee806be718d2afa04 (patch)
treedee59cd39b752666039c5c3961bc42bbc5bf39f8 /innobase
parente13089f8d7d3a4160b8642d0c8fc2cd448e68a0e (diff)
downloadmariadb-git-5df707c7c9fe5ac760c7136ee806be718d2afa04.tar.gz
Portability fixes
innobase/os/os0thread.c: Portability fix myisam/sort.c: Fixed wrong variable type (gave compiler warning)
Diffstat (limited to 'innobase')
-rw-r--r--innobase/os/os0thread.c2
1 files changed, 2 insertions, 0 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. */