diff --git a/include/my_cpu.h b/include/my_cpu.h
index 2b34e03fce3..028dc05bd08 100644
--- a/include/my_cpu.h
+++ b/include/my_cpu.h
@@ -59,8 +59,8 @@
 #define HMT_high()
 #endif
 
-#if defined __i386__ || defined __x86_64__ || defined _WIN32
-# define HAVE_PAUSE_INSTRUCTION /* added in Intel Pentium 4 */
+#if defined __i386__ || defined __x86_64__ || defined _M_IX86 || defined _M_X64
+# define HAVE_PAUSE_INSTRUCTION /* no-op repurposed in Intel Pentium 4 */
 #endif
 
 #ifdef _WIN32
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index c02c4e9debe..dc89f0a07a8 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6023,6 +6023,12 @@ int mysqld_main(int argc, char **argv)
                           mysqld_port, MYSQL_COMPILATION_COMMENT);
   }
 
+#ifdef HAVE_PAUSE_INSTRUCTION
+  if (global_system_variables.log_warnings > 2)
+    sql_print_information("Using PAUSE multiplier %u",
+                          my_cpu_relax_multiplier);
+#endif
+
 #ifndef _WIN32
   // try to keep fd=0 busy
   if (please_close_stdin && !freopen("/dev/null", "r", stdin))