summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-18 23:49:25 +0300
committerunknown <monty@donna.mysql.fi>2001-04-18 23:49:25 +0300
commite0d42da39112930c6bcb4fe8571dd1f823671cb9 (patch)
tree3c52825593f66c04587df41584b3cb37f7042bda /innobase
parent09518126f1d05214b2e6518825d819cc86138f1f (diff)
parent9d36f27bb021a3496e3b08c91f62a27daaad7664 (diff)
downloadmariadb-git-e0d42da39112930c6bcb4fe8571dd1f823671cb9.tar.gz
merge
Diffstat (limited to 'innobase')
-rw-r--r--innobase/os/os0thread.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/innobase/os/os0thread.c b/innobase/os/os0thread.c
index 05e1e6201a4..11bff73608a 100644
--- a/innobase/os/os0thread.c
+++ b/innobase/os/os0thread.c
@@ -138,7 +138,11 @@ os_thread_yield(void)
#if defined(__WIN__)
Sleep(0);
#elif (defined(HAVE_SCHED_YIELD) && defined(HAVE_SCHED_H))
- sched_yield();
+ sched_yield();
+#elif defined(HAVE_PTHREAD_YIELD_ZERO_ARG)
+ pthread_yield();
+#elif defined(HAVE_PTHREAD_YIELD_ONE_ARG)
+ pthread_yield(0);
#else
os_thread_sleep(0);
#endif