Windows test stabilisation fix (disable threads only on certain platf…

…orms)
mysql · Jul 1, 2016 · 5ea888e · 5ea888e
1 parent 76b512c
commit 5ea888e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled.result b/mysql-test/suite/sysschema/r/pr_ps_setup_show_enabled.result
@@ -10,7 +10,11 @@ SET ENABLED = 'NO'
 UPDATE performance_schema.setup_consumers
 SET ENABLED = 'NO'
  WHERE NAME LIKE '%\_history\_long';
-UPDATE performance_schema.threads SET INSTRUMENTED = 'NO' WHERE NAME LIKE 'thread/innodb/srv\_%';
+UPDATE performance_schema.threads
+SET INSTRUMENTED = 'NO'
+ WHERE NAME LIKE 'thread/innodb/srv\_%'
+    OR NAME LIKE '%con\_%'
+    OR NAME LIKE '%signal_handler%';
 CALL sys.ps_setup_show_enabled(FALSE, FALSE);
 performance_schema_enabled
 1
@@ -208,7 +212,6 @@ innodb/page_cleaner_thread	BACKGROUND
 root@localhost	FOREGROUND
 sql/compress_gtid_table	FOREGROUND
 sql/main	BACKGROUND
-sql/signal_handler	BACKGROUND
 sql/thread_timer_notifier	BACKGROUND
 CALL sys.ps_setup_show_enabled(TRUE, TRUE);
 performance_schema_enabled
@@ -247,7 +250,6 @@ innodb/page_cleaner_thread	BACKGROUND
 root@localhost	FOREGROUND
 sql/compress_gtid_table	FOREGROUND
 sql/main	BACKGROUND
-sql/signal_handler	BACKGROUND
 sql/thread_timer_notifier	BACKGROUND
 enabled_instruments	timed
 idle	YES

diff --git a/mysql-test/suite/sysschema/t/pr_ps_setup_show_enabled.test b/mysql-test/suite/sysschema/t/pr_ps_setup_show_enabled.test
@@ -20,8 +20,12 @@ UPDATE performance_schema.setup_consumers
    SET ENABLED = 'NO'
  WHERE NAME LIKE '%\_history\_long';
 
-# Disable some of the background threads:
-UPDATE performance_schema.threads SET INSTRUMENTED = 'NO' WHERE NAME LIKE 'thread/innodb/srv\_%';
+# Disable some of the background threads (including those that differ between unix like and Windows systems):
+UPDATE performance_schema.threads
+   SET INSTRUMENTED = 'NO'
+ WHERE NAME LIKE 'thread/innodb/srv\_%'
+    OR NAME LIKE '%con\_%'
+    OR NAME LIKE '%signal_handler%';
 
 # Show limited info (no thread or instrument info)
 CALL sys.ps_setup_show_enabled(FALSE, FALSE);