Merge pull request #70 from kennt-percona/3.x-5.7-buildfix

build fix
percona · Jul 26, 2016 · d8c56aa · d8c56aa
2 parents 595d7a4 + d090daf
commit d8c56aa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/galera/src/ist.hpp b/galera/src/ist.hpp
@@ -162,8 +162,12 @@ namespace galera
             AsyncSenderMap(GCS_IMPL& gcs, gcache::GCache& gcache)
                 :
                 senders_(),
+#ifdef HAVE_PSI_INTERFACE
                 monitor_(WSREP_PFS_INSTR_TAG_ASYNC_SENDER_MONITOR_MUTEX,
                          WSREP_PFS_INSTR_TAG_ASYNC_SENDER_MONITOR_CONDVAR),
+#else
+                monitor_(),
+#endif /* HAVE_PSI_INTERFACE */
                 gcache_(gcache) { }
             void run(const gu::Config& conf,
                      const std::string& peer,

diff --git a/galera/src/replicator_smm.cpp b/galera/src/replicator_smm.cpp
@@ -182,12 +182,18 @@ galera::ReplicatorSMM::ReplicatorSMM(const struct wsrep_init_args* args)
     ist_senders_        (gcs_, gcache_),
     wsdb_               (),
     cert_               (config_, service_thd_),
+#ifdef HAVE_PSI_INTERFACE
     local_monitor_      (WSREP_PFS_INSTR_TAG_LOCAL_MONITOR_MUTEX,
                          WSREP_PFS_INSTR_TAG_LOCAL_MONITOR_CONDVAR),
     apply_monitor_      (WSREP_PFS_INSTR_TAG_APPLY_MONITOR_MUTEX,
                          WSREP_PFS_INSTR_TAG_APPLY_MONITOR_CONDVAR),
     commit_monitor_     (WSREP_PFS_INSTR_TAG_COMMIT_MONITOR_MUTEX,
                          WSREP_PFS_INSTR_TAG_COMMIT_MONITOR_CONDVAR),
+#else
+    local_monitor_      (),
+    apply_monitor_      (),
+    commit_monitor_     (),
+#endif /* HAVE_PSI_INTERFACE */
     causal_read_timeout_(config_.get(Param::causal_read_timeout)),
     receivers_          (),
     replicated_         (),

diff --git a/galera/tests/ist_check.cpp b/galera/tests/ist_check.cpp
@@ -135,8 +135,12 @@ struct trx_thread_args
     trx_thread_args(galera::ist::Receiver& receiver)
         :
         receiver_(receiver),
+#ifdef HAVE_PSI_INTERFACE
         monitor_(WSREP_PFS_INSTR_TAG_IST_RECEIVER_MONITOR_MUTEX,
                  WSREP_PFS_INSTR_TAG_IST_RECEIVER_MONITOR_CONDVAR)
+#else
+        monitor_()
+#endif /* HAVE_PSI_INTERFACE */
     { }
 };