2 files changed, 28 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/r/variables_by_thread.result b/mysql-test/suite/perfschema/r/variables_by_thread.result
index afb4976eb20..133b1c2642d 100644
--- a/mysql-test/suite/perfschema/r/variables_by_thread.result
+++ b/mysql-test/suite/perfschema/r/variables_by_thread.result
@@ -147,6 +147,21 @@ WHERE variable_name = "time_zone";
 current	variable_value
 1	+02:00
 0	SYSTEM
+# Test sleep
+connect  con_sleep, localhost, root,,;
+set debug_sync= "func_sleep_locked SIGNAL lock WAIT_FOR goon";
+select sleep(3);
+connection default;
+set debug_sync= "now WAIT_FOR lock";
+set debug_sync= "apc_after_notify SIGNAL goon";
+SELECT thread_id = @def_thread_id as current, variable_value
+FROM performance_schema.variables_by_thread
+WHERE variable_name = "time_zone";
+current	variable_value
+1	+02:00
+0	SYSTEM
+0	SYSTEM
+disconnect con_sleep;
 # Cleanup
 connection default;
 set debug_sync= "reset";
diff --git a/mysql-test/suite/perfschema/t/variables_by_thread.test b/mysql-test/suite/perfschema/t/variables_by_thread.test
index e63b3363fa4..b670fb58031 100644
--- a/mysql-test/suite/perfschema/t/variables_by_thread.test
+++ b/mysql-test/suite/perfschema/t/variables_by_thread.test
@@ -149,6 +149,19 @@ SELECT thread_id = @def_thread_id as current, variable_value
   FROM performance_schema.variables_by_thread
   WHERE variable_name = "time_zone";
 
+--echo # Test sleep
+
+--connect (con_sleep, localhost, root,,)
+set debug_sync= "func_sleep_locked SIGNAL lock WAIT_FOR goon";
+send select sleep(3);
+
+--connection default
+set debug_sync= "now WAIT_FOR lock";
+set debug_sync= "apc_after_notify SIGNAL goon";
+SELECT thread_id = @def_thread_id as current, variable_value
+  FROM performance_schema.variables_by_thread
+  WHERE variable_name = "time_zone";
+--disconnect con_sleep
 
 --echo # Cleanup
 --connection default