diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-05 20:22:39 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2021-09-05 20:22:39 +0200 |
| commit | 12c3d1e1d7eee013f2f2ee75965803822a95d43e (patch) | |
| tree | d1c500b4018cd1d8c45ddb2f0f97231c6a2aa276 | |
| parent | ae85835cc7fa88bb80a282106c1e905d85157923 (diff) | |
| download | mariadb-git-12c3d1e1d7eee013f2f2ee75965803822a95d43e.tar.gz | |
Fix Windows warnings and tests for -DPLUGIN_PERFSCHEMA=NO
| -rw-r--r-- | mysql-test/main/mysql_install_db_win.result | 6 | ||||
| -rw-r--r-- | mysql-test/main/mysql_upgrade_noengine.test | 1 | ||||
| -rw-r--r-- | mysql-test/std_data/mysql_install_db_win.ini | 6 | ||||
| -rw-r--r-- | sql/mdl.cc | 4 | ||||
| -rw-r--r-- | storage/innobase/include/btr0sea.h | 10 |
5 files changed, 15 insertions, 12 deletions
diff --git a/mysql-test/main/mysql_install_db_win.result b/mysql-test/main/mysql_install_db_win.result index 936165bd052..2440ff351ea 100644 --- a/mysql-test/main/mysql_install_db_win.result +++ b/mysql-test/main/mysql_install_db_win.result @@ -26,12 +26,6 @@ tmpdir=BASEDIR/temp innodb_data_file_path=ibdata1:10M;ibdata2:10M:autoextend innodb_log_group_home_dir=BASEDIR/data skip-name-resolve - -#********************************************************* -# performance_schema -#********************************************************* -performance_schema=OFF - [client] port=3307 # restart 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/mysql-test/std_data/mysql_install_db_win.ini b/mysql-test/std_data/mysql_install_db_win.ini index e9b5e7a84b0..c375bdb4bf3 100644 --- a/mysql-test/std_data/mysql_install_db_win.ini +++ b/mysql-test/std_data/mysql_install_db_win.ini @@ -10,9 +10,3 @@ tmpdir=BASEDIR/temp innodb_data_file_path=ibdata1:10M;ibdata2:10M:autoextend innodb_log_group_home_dir=BASEDIR/data skip-name-resolve - -#********************************************************* -# performance_schema -#********************************************************* -performance_schema=OFF - diff --git a/sql/mdl.cc b/sql/mdl.cc index 67ebc70d860..dc1d658b0b5 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) { diff --git a/storage/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h index da7bbac1f83..31ca4ba53dd 100644 --- a/storage/innobase/include/btr0sea.h +++ b/storage/innobase/include/btr0sea.h @@ -243,10 +243,20 @@ struct btr_search_sys_t /** memory heap for table */ mem_heap_t *heap; +#ifdef _MSC_VER +#pragma warning(push) +// nonstandard extension - zero sized array, if perfschema is not compiled +#pragma warning(disable : 4200) +#endif + char pad[(CPU_LEVEL1_DCACHE_LINESIZE - sizeof(srw_lock) - sizeof(hash_table_t) - sizeof(mem_heap_t)) & (CPU_LEVEL1_DCACHE_LINESIZE - 1)]; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + void init() { memset((void*) this, 0, sizeof *this); |