MDEV-24167: Fix -DPLUGIN_PERFSCHEMA=NO and Windows debug builds

Author: dr-m

storage/innobase/dict/dict0dict.cc

@@ -1038,7 +1038,7 @@ void dict_sys_t::create()
   table_id_hash.create(hash_size);
   temp_id_hash.create(hash_size);
 
-  latch.init(dict_operation_lock_key);
+  latch.SRW_LOCK_INIT(dict_operation_lock_key);
 
   if (!srv_read_only_mode)
   {

storage/innobase/fil/fil0fil.cc

@@ -957,7 +957,7 @@ fil_space_t *fil_space_t::create(const char *name, ulint id, ulint flags,
 			 << " " << fil_crypt_get_type(crypt_data));
 	}
 
-	space->latch.init(fil_space_latch_key);
+	space->latch.SRW_LOCK_INIT(fil_space_latch_key);
 
 	if (space->purpose == FIL_TYPE_TEMPORARY) {
 		/* SysTablespace::open_or_create() would pass

storage/innobase/include/btr0sea.h

@@ -250,7 +250,7 @@ struct btr_search_sys_t
     void init()
     {
       memset((void*) this, 0, sizeof *this);
-      latch.init(btr_search_latch_key);
+      latch.SRW_LOCK_INIT(btr_search_latch_key);
     }
 
     void alloc(ulint hash_size)

storage/innobase/include/srw_lock.h

@@ -32,6 +32,12 @@ this program; if not, write to the Free Software Foundation, Inc.,
 # endif
 #endif
 
+#ifdef UNIV_PFS_RWLOCK
+# define SRW_LOCK_INIT(key) init(key)
+#else
+# define SRW_LOCK_INIT(key) init()
+#endif
+
 class srw_lock final
 #if defined __linux__ && !defined SRW_LOCK_DUMMY
   : protected rw_lock
@@ -40,7 +46,7 @@ class srw_lock final
 #if defined SRW_LOCK_DUMMY || (!defined _WIN32 && !defined __linux__)
   mysql_rwlock_t lock;
 public:
-  void init(mysql_pfs_key_t key) { mysql_rwlock_init(key, &lock); }
+  void SRW_LOCK_INIT(mysql_pfs_key_t key) { mysql_rwlock_init(key, &lock); }
   void destroy() { mysql_rwlock_destroy(&lock); }
   void rd_lock() { mysql_rwlock_rdlock(&lock); }
   void rd_unlock() { mysql_rwlock_unlock(&lock); }
@@ -67,7 +73,7 @@ class srw_lock final
 # endif
 
 public:
-  void init(mysql_pfs_key_t key)
+  void SRW_LOCK_INIT(mysql_pfs_key_t key)
   {
 # ifdef UNIV_PFS_RWLOCK
     pfs_psi= PSI_RWLOCK_CALL(init_rwlock)(key, this);
@@ -83,7 +89,7 @@ class srw_lock final
       pfs_psi= nullptr;
     }
 # endif
-    DBUG_ASSERT(!is_locked_or_waiting());
+    IF_WIN(, DBUG_ASSERT(!is_locked_or_waiting()));
   }
   void rd_lock()
   {

storage/innobase/trx/trx0i_s.cc

@@ -1263,7 +1263,7 @@ trx_i_s_cache_init(
 	acquire trx_i_s_cache_t::rw_lock, rdlock
 	release trx_i_s_cache_t::rw_lock */
 
-	cache->rw_lock.init(trx_i_s_cache_lock_key);
+	cache->rw_lock.SRW_LOCK_INIT(trx_i_s_cache_lock_key);
 
 	cache->last_read = 0;
 

storage/innobase/trx/trx0purge.cc

@@ -175,7 +175,7 @@ void purge_sys_t::create()
   offset= 0;
   hdr_page_no= 0;
   hdr_offset= 0;
-  latch.init(trx_purge_latch_key);
+  latch.SRW_LOCK_INIT(trx_purge_latch_key);
   mutex_create(LATCH_ID_PURGE_SYS_PQ, &pq_mutex);
   truncate.current= NULL;
   truncate.last= NULL;