diff options
| -rw-r--r-- | CMakeLists.txt | 19 | ||||
| -rw-r--r-- | mysys/waiting_threads.c | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2599a025e27..dd4f135bf4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -298,14 +298,16 @@ ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(regex) ADD_SUBDIRECTORY(mysys) ADD_SUBDIRECTORY(libmysql) - +ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(extra) +ADD_SUBDIRECTORY(libservices) +ADD_SUBDIRECTORY(scripts) +ADD_SUBDIRECTORY(sql/share) +ADD_SUBDIRECTORY(support-files) + IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) - ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(sql) - ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(libservices) OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) @@ -314,12 +316,11 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(mysql-test) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) - ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(sql-bench) - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() +ENDIF() + +IF(UNIX) + ADD_SUBDIRECTORY(man) ENDIF() INCLUDE(cmake/abi_check.cmake) diff --git a/mysys/waiting_threads.c b/mysys/waiting_threads.c index f7e74e012d2..0a9474e68b4 100644 --- a/mysys/waiting_threads.c +++ b/mysys/waiting_threads.c @@ -193,7 +193,9 @@ uint32 wt_success_stats; static my_atomic_rwlock_t cycle_stats_lock, wait_stats_lock, success_stats_lock; +#ifdef HAVE_PSI_INTERFACE extern PSI_cond_key key_WT_RESOURCE_cond; +#endif #ifdef SAFE_STATISTICS #define incr(VAR, LOCK) \ |