diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-21 09:11:14 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-21 09:11:14 +0100 |
| commit | ade89fc8980a0b2763734815df7634a129c6d5dc (patch) | |
| tree | 5b5056d4a183241a8d0a6e2e93d304833934d2e6 /storage/tokudb/PerconaFT/portability | |
| parent | bc43bf3e430c20bc2178e584215bd443054709d6 (diff) | |
| parent | a5b38151c0c020633ff2f3bbd18901427039f5b4 (diff) | |
| download | mariadb-git-ade89fc8980a0b2763734815df7634a129c6d5dc.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/tokudb/PerconaFT/portability')
| -rw-r--r-- | storage/tokudb/PerconaFT/portability/toku_instr_mysql.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/storage/tokudb/PerconaFT/portability/toku_instr_mysql.cc b/storage/tokudb/PerconaFT/portability/toku_instr_mysql.cc index 786a6ef0546..0f287429542 100644 --- a/storage/tokudb/PerconaFT/portability/toku_instr_mysql.cc +++ b/storage/tokudb/PerconaFT/portability/toku_instr_mysql.cc @@ -359,7 +359,16 @@ void toku_instr_rwlock_wrlock_wait_end( void toku_instr_rwlock_unlock(toku_pthread_rwlock_t &rwlock) { if (rwlock.psi_rwlock) + +// Due to change introduced in e4148f2a22922687f7652c4e3d21a22da07c9e78 +// PSI rwlock version and interface changed +// PSI_CURRENT_RWLOCK_VERSION is not defined in MySQL 5.6 and is defined +// as 1 in 5.7 and < 8.0.17 +#if defined(PSI_CURRENT_RWLOCK_VERSION) && (PSI_CURRENT_RWLOCK_VERSION == 2) + PSI_RWLOCK_CALL(unlock_rwlock)(rwlock.psi_rwlock, PSI_RWLOCK_UNLOCK); +#else PSI_RWLOCK_CALL(unlock_rwlock)(rwlock.psi_rwlock); +#endif } #endif // TOKU_MYSQL_WITH_PFS |