WL#9223

Erik Froseth · dahlerlend · commit 84ebe8babdfd · 2017-08-23T07:05:21.000+02:00
Post-push fix: The test perfschema.threads_history gave a different
result in release and debug builds. The root cause for this was that
the default size for performance_schema_events_waits_history_long_size
is 10000. The server creates a different number of events_waits markers in
release and debug, and in debug it exceeds 10000 for the table
events_waits_history_long. The result is that the performance schema
table starts to eat up itself, since it is implemented as a ring buffer.
This would give a different result in the test file for release and debug
builds.

The fix is to increase the size of the variable
performance_schema_events_waits_history_long_size to ensure that the
performance schema table doesn't start to eat up itself.

Change-Id: I354bc1ae48630639c947d85a5fdf3e65c4d878ed
diff --git a/mysql-test/suite/perfschema/r/threads_history.result b/mysql-test/suite/perfschema/r/threads_history.result
@@ -1,3 +1,4 @@
+# restart: --performance_schema_events_waits_history_long_size=20000
 create user user1@localhost;
 create user user2@localhost;
 create user user3@localhost;
@@ -220,7 +221,7 @@ idle
 has_waits
 1
 has_waits
-0
+1
 "=========================== Waits user 2"
 EVENT_NAME
 idle
@@ -615,7 +616,7 @@ idle
 has_waits
 1
 has_waits
-0
+1
 "=========================== Waits user 2"
 EVENT_NAME
 idle
diff --git a/mysql-test/suite/perfschema/t/threads_history.test b/mysql-test/suite/perfschema/t/threads_history.test
@@ -4,6 +4,11 @@
 # Test requires: sp-protocol/ps-protocol/view-protocol/cursor-protocol disabled
 --source include/no_protocol.inc
 
+# Increase the size of performance_schema_events_waits_history_long_size so
+# that the table doesn't get truncated when running full.
+let $restart_parameters=restart: --performance_schema_events_waits_history_long_size=20000;
+--source include/restart_mysqld.inc
+
 create user user1@localhost;
 create user user2@localhost;
 create user user3@localhost;
@@ -237,7 +242,7 @@ eval select EVENT_NAME from performance_schema.events_waits_current
   order by THREAD_ID, EVENT_ID;
 eval select (count(*) > 5) as has_waits from performance_schema.events_waits_history
   where THREAD_ID = $con1_thread_id;
-eval select (count(*) > 16) as has_waits from performance_schema.events_waits_history_long
+eval select (count(*) > 15) as has_waits from performance_schema.events_waits_history_long
   where THREAD_ID = $con1_thread_id;
 
 echo "=========================== Waits user 2";
@@ -667,7 +672,7 @@ eval select EVENT_NAME from performance_schema.events_waits_current
   order by THREAD_ID, EVENT_ID;
 eval select (count(*) > 5) as has_waits from performance_schema.events_waits_history
   where THREAD_ID = $con1_thread_id;
-eval select (count(*) > 16) as has_waits from performance_schema.events_waits_history_long
+eval select (count(*) > 15) as has_waits from performance_schema.events_waits_history_long
   where THREAD_ID = $con1_thread_id;
 
 echo "=========================== Waits user 2";
