Fix Windows warnings and tests for -DPLUGIN_PERFSCHEMA=NO

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

mysql-test/main/mysql_upgrade_noengine.test

 #
 # 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;
 

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
-

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)
   {

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);