diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 16:47:30 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-11 16:47:59 +0200 |
| commit | cef656b11c353897b0d7f6463c2971ae8a3b13b4 (patch) | |
| tree | 5ef97ba38f157ad433040d687268fa99d448b84b | |
| parent | c3341f84404c67ab70faed1ec28fcb4e900ccfdd (diff) | |
| download | mariadb-git-cef656b11c353897b0d7f6463c2971ae8a3b13b4.tar.gz | |
Fix Windows warnings and tests for -DPLUGIN_PERFSCHEMA=NO
| -rw-r--r-- | mysql-test/main/mysql_upgrade_noengine.test | 1 | ||||
| -rw-r--r-- | sql/mdl.cc | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/main/mysql_upgrade_noengine.test b/mysql-test/main/mysql_upgrade_noengine.test index 5b063fb3d8c..efe36c355ab 100644 --- a/mysql-test/main/mysql_upgrade_noengine.test +++ b/mysql-test/main/mysql_upgrade_noengine.test @@ -1,6 +1,7 @@ # # MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation # +source include/mysql_upgrade_preparation.inc; source include/have_innodb.inc; source include/not_embedded.inc; diff --git a/sql/mdl.cc b/sql/mdl.cc index 0349d147023..3ce0e102d2d 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -2336,11 +2336,13 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout) mysql_prlock_unlock(&lock->m_rwlock); +#ifdef HAVE_PSI_INTERFACE PSI_metadata_locker_state state __attribute__((unused)); PSI_metadata_locker *locker= NULL; if (ticket->m_psi != NULL) locker= PSI_CALL_start_metadata_wait(&state, ticket->m_psi, __FILE__, __LINE__); +#endif will_wait_for(ticket); @@ -2387,8 +2389,10 @@ MDL_context::acquire_lock(MDL_request *mdl_request, double lock_wait_timeout) done_waiting_for(); +#ifdef HAVE_PSI_INTERFACE if (locker != NULL) PSI_CALL_end_metadata_wait(locker, 0); +#endif if (wait_status != MDL_wait::GRANTED) { |