diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-10-28 13:57:15 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-10-28 13:57:15 +0200 |
| commit | 89f69c62cfc2fb88de8fd4f5c9e4deaf0a27db73 (patch) | |
| tree | b7c175c014238c50d55a306698f89036ffeeb643 /storage/tokudb | |
| parent | 3a79e5fd317316c293baa459e8296fdb0744c280 (diff) | |
| parent | 2ddea602ce18054ad5b6130a692b509506d2bde7 (diff) | |
| download | mariadb-git-89f69c62cfc2fb88de8fd4f5c9e4deaf0a27db73.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'storage/tokudb')
| -rw-r--r-- | storage/tokudb/PerconaFT/portability/toku_pthread.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/tokudb/PerconaFT/portability/toku_pthread.cc b/storage/tokudb/PerconaFT/portability/toku_pthread.cc index fe8a4d485cd..c066a734bae 100644 --- a/storage/tokudb/PerconaFT/portability/toku_pthread.cc +++ b/storage/tokudb/PerconaFT/portability/toku_pthread.cc @@ -55,7 +55,9 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved. #include <toku_pthread.h> int toku_pthread_yield(void) { -#if defined(HAVE_PTHREAD_YIELD) +#if defined(HAVE_SCHED_YIELD) + return sched_yield(); +#elif defined(HAVE_PTHREAD_YIELD) # if defined(PTHREAD_YIELD_RETURNS_INT) return pthread_yield(); # elif defined(PTHREAD_YIELD_RETURNS_VOID) |