5.6.24

84 files changed, 281 insertions, 818 deletions

diff --git a/mysql-test/suite/perfschema/r/digest_null_literal.result b/mysql-test/suite/perfschema/r/digest_null_literal.result
new file mode 100644
index 00000000000..b0cefbbbaaf
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/digest_null_literal.result
@@ -0,0 +1,27 @@
+TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
+NULL
+NULL
+NULL
+NULL
+NULL	NULL
+NULL	NULL
+NULL	NULL	NULL	1	2	3	NULL	NULL
+NULL	NULL	NULL	1	2	3	NULL	NULL
+1 IS NULL
+0
+2 IS NOT NULL
+1
+1 IS NULL	2 IS NULL	3 IS NOT NULL	4 IS NOT NULL
+0	0	1	1
+SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR
+FROM performance_schema.events_statements_summary_by_digest;
+SCHEMA_NAME	DIGEST_TEXT	COUNT_STAR
+test	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 	1
+test	SELECT ? 	1
+test	SELECT ? FROM DUAL 	1
+test	SELECT ?, ... 	2
+test	SELECT ? IS NULL 	1
+test	SELECT ? IS NOT NULL 	1
+test	SELECT ? IS NULL , ? IS NULL , ? IS NOT NULL , ? IS NOT NULL 	1
+test	CREATE TABLE foo ( a INTEGER DEFAULT ? , b INTEGER NOT NULL DEFAULT ? , c INTEGER NOT NULL ) 	1
+test	DROP TABLE foo 	1
diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result
index e8fd6fcc19b..3a2786db01b 100644
--- a/mysql-test/suite/perfschema/r/ortho_iter.result
+++ b/mysql-test/suite/perfschema/r/ortho_iter.result
@@ -92,7 +92,9 @@ close pfs_cursor;
 signal sqlstate '01000' set message_text='Done', mysql_errno=12000;
 end
 $
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -116,7 +118,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
@@ -125,31 +126,6 @@ performance_schema_session_connect_attrs_size	2048
 performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
 call check_instrument("wait/synch/mutex/");
 instr_name	is_wait	is_stage	is_statement
 wait/synch/mutex/	1	0	0
diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result
index ffba8643d79..c8c5ca2ba45 100644
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result
@@ -22,7 +22,9 @@ flush privileges;
 insert into test.marker set a = 1;
 insert into test.marker set a = 1;
 insert into test.marker set a = 1;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -46,7 +48,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/sizing_default.result b/mysql-test/suite/perfschema/r/sizing_default.result
index ef7f7069c19..d7c4e321204 100644
--- a/mysql-test/suite/perfschema/r/sizing_default.result
+++ b/mysql-test/suite/perfschema/r/sizing_default.result
@@ -7,7 +7,9 @@ table_open_cache	2000
 show variables like "max_connections";
 Variable_name	Value
 max_connections	151
-show variables like "%performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -31,7 +33,6 @@ performance_schema_max_rwlock_instances	9102
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	322
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	4000
 performance_schema_max_table_instances	12500
 performance_schema_max_thread_classes	50
@@ -65,160 +66,3 @@ Performance_schema_table_instances_lost	0
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
-show engine performance_schema status;
-Type	Name	Status
-performance_schema	events_waits_current.row_size	184
-performance_schema	events_waits_current.row_count	2412
-performance_schema	events_waits_history.row_size	184
-performance_schema	events_waits_history.row_count	4020
-performance_schema	events_waits_history.memory	739680
-performance_schema	events_waits_history_long.row_size	184
-performance_schema	events_waits_history_long.row_count	10000
-performance_schema	events_waits_history_long.memory	1840000
-performance_schema	(pfs_mutex_class).row_size	256
-performance_schema	(pfs_mutex_class).row_count	200
-performance_schema	(pfs_mutex_class).memory	51200
-performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	40
-performance_schema	(pfs_rwlock_class).memory	12800
-performance_schema	(pfs_cond_class).row_size	256
-performance_schema	(pfs_cond_class).row_count	80
-performance_schema	(pfs_cond_class).memory	20480
-performance_schema	(pfs_thread_class).row_size	192
-performance_schema	(pfs_thread_class).row_count	50
-performance_schema	(pfs_thread_class).memory	9600
-performance_schema	(pfs_file_class).row_size	320
-performance_schema	(pfs_file_class).row_count	50
-performance_schema	(pfs_file_class).memory	16000
-performance_schema	mutex_instances.row_size	128
-performance_schema	mutex_instances.row_count	15906
-performance_schema	mutex_instances.memory	2035968
-performance_schema	rwlock_instances.row_size	192
-performance_schema	rwlock_instances.row_count	9102
-performance_schema	rwlock_instances.memory	1747584
-performance_schema	cond_instances.row_size	128
-performance_schema	cond_instances.row_count	3504
-performance_schema	cond_instances.memory	448512
-performance_schema	threads.row_size	2816
-performance_schema	threads.row_count	402
-performance_schema	threads.memory	1132032
-performance_schema	file_instances.row_size	704
-performance_schema	file_instances.row_count	7693
-performance_schema	file_instances.memory	5415872
-performance_schema	(pfs_file_handle).row_size	8
-performance_schema	(pfs_file_handle).row_count	32768
-performance_schema	(pfs_file_handle).memory	262144
-performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	153966
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	4926912
-performance_schema	(pfs_table_share).row_size	22208
-performance_schema	(pfs_table_share).row_count	12500
-performance_schema	(pfs_table_share).memory	277600000
-performance_schema	(pfs_table).row_size	9280
-performance_schema	(pfs_table).row_count	4000
-performance_schema	(pfs_table).memory	37120000
-performance_schema	setup_actors.row_size	256
-performance_schema	setup_actors.row_count	100
-performance_schema	setup_actors.memory	25600
-performance_schema	setup_objects.row_size	448
-performance_schema	setup_objects.row_count	100
-performance_schema	setup_objects.memory	44800
-performance_schema	(pfs_account).row_size	256
-performance_schema	(pfs_account).row_count	100
-performance_schema	(pfs_account).memory	25600
-performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_account_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_user_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_host_by_event_name.memory	1225600
-performance_schema	(pfs_user).row_size	128
-performance_schema	(pfs_user).row_count	100
-performance_schema	(pfs_user).memory	12800
-performance_schema	(pfs_host).row_size	128
-performance_schema	(pfs_host).row_count	100
-performance_schema	(pfs_host).memory	12800
-performance_schema	(pfs_stage_class).row_size	256
-performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	38400
-performance_schema	events_stages_history.row_size	88
-performance_schema	events_stages_history.row_count	4020
-performance_schema	events_stages_history.memory	353760
-performance_schema	events_stages_history_long.row_size	88
-performance_schema	events_stages_history_long.row_count	10000
-performance_schema	events_stages_history_long.memory	880000
-performance_schema	events_stages_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_thread_by_event_name.row_count	60300
-performance_schema	events_stages_summary_by_thread_by_event_name.memory	1929600
-performance_schema	events_stages_summary_global_by_event_name.row_size	32
-performance_schema	events_stages_summary_global_by_event_name.row_count	150
-performance_schema	events_stages_summary_global_by_event_name.memory	4800
-performance_schema	events_stages_summary_by_account_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_account_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_account_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_user_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_user_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_user_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_host_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_host_by_event_name.memory	480000
-performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	168
-performance_schema	(pfs_statement_class).memory	32256
-performance_schema	events_statements_history.row_size	3024
-performance_schema	events_statements_history.row_count	4020
-performance_schema	events_statements_history.memory	12156480
-performance_schema	events_statements_history_long.row_size	3024
-performance_schema	events_statements_history_long.row_count	10000
-performance_schema	events_statements_history_long.memory	30240000
-performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	67536
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	12426624
-performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	168
-performance_schema	events_statements_summary_global_by_event_name.memory	30912
-performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_account_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_user_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_host_by_event_name.memory	3091200
-performance_schema	events_statements_current.row_size	3024
-performance_schema	events_statements_current.row_count	402
-performance_schema	events_statements_current.memory	1215648
-performance_schema	(pfs_socket_class).row_size	320
-performance_schema	(pfs_socket_class).row_count	10
-performance_schema	(pfs_socket_class).memory	3200
-performance_schema	socket_instances.row_size	320
-performance_schema	socket_instances.row_count	322
-performance_schema	socket_instances.memory	103040
-performance_schema	events_statements_summary_by_digest.row_size	1472
-performance_schema	events_statements_summary_by_digest.row_count	10000
-performance_schema	events_statements_summary_by_digest.memory	14720000
-performance_schema	session_connect_attrs.row_size	402
-performance_schema	session_connect_attrs.row_count	512
-performance_schema	session_connect_attrs.memory	205824
-performance_schema	(account_hash).count	2
-performance_schema	(account_hash).size	100
-performance_schema	(digest_hash).count	0
-performance_schema	(digest_hash).size	10000
-performance_schema	(filename_hash).count	0
-performance_schema	(filename_hash).size	7693
-performance_schema	(host_hash).count	2
-performance_schema	(host_hash).size	100
-performance_schema	(setup_actor_hash).count	1
-performance_schema	(setup_actor_hash).size	100
-performance_schema	(setup_object_hash).count	4
-performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	80
-performance_schema	(table_share_hash).size	12500
-performance_schema	(user_hash).count	2
-performance_schema	(user_hash).size	100
-performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	422231328
diff --git a/mysql-test/suite/perfschema/r/sizing_high.result b/mysql-test/suite/perfschema/r/sizing_high.result
index 4d63c970782..c7c7b065992 100644
--- a/mysql-test/suite/perfschema/r/sizing_high.result
+++ b/mysql-test/suite/perfschema/r/sizing_high.result
@@ -7,7 +7,9 @@ table_open_cache	400
 show variables like "max_connections";
 Variable_name	Value
 max_connections	200
-show variables like "%performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -31,7 +33,6 @@ performance_schema_max_rwlock_instances	30800
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	420
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	800
 performance_schema_max_table_instances	12500
 performance_schema_max_thread_classes	50
@@ -65,160 +66,3 @@ Performance_schema_table_instances_lost	0
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
-show engine performance_schema status;
-Type	Name	Status
-performance_schema	events_waits_current.row_size	184
-performance_schema	events_waits_current.row_count	3000
-performance_schema	events_waits_history.row_size	184
-performance_schema	events_waits_history.row_count	5000
-performance_schema	events_waits_history.memory	920000
-performance_schema	events_waits_history_long.row_size	184
-performance_schema	events_waits_history_long.row_count	10000
-performance_schema	events_waits_history_long.memory	1840000
-performance_schema	(pfs_mutex_class).row_size	256
-performance_schema	(pfs_mutex_class).row_count	200
-performance_schema	(pfs_mutex_class).memory	51200
-performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	40
-performance_schema	(pfs_rwlock_class).memory	12800
-performance_schema	(pfs_cond_class).row_size	256
-performance_schema	(pfs_cond_class).row_count	80
-performance_schema	(pfs_cond_class).memory	20480
-performance_schema	(pfs_thread_class).row_size	192
-performance_schema	(pfs_thread_class).row_count	50
-performance_schema	(pfs_thread_class).memory	9600
-performance_schema	(pfs_file_class).row_size	320
-performance_schema	(pfs_file_class).row_count	50
-performance_schema	(pfs_file_class).memory	16000
-performance_schema	mutex_instances.row_size	128
-performance_schema	mutex_instances.row_count	52200
-performance_schema	mutex_instances.memory	6681600
-performance_schema	rwlock_instances.row_size	192
-performance_schema	rwlock_instances.row_count	30800
-performance_schema	rwlock_instances.memory	5913600
-performance_schema	cond_instances.row_size	128
-performance_schema	cond_instances.row_count	10900
-performance_schema	cond_instances.memory	1395200
-performance_schema	threads.row_size	2816
-performance_schema	threads.row_count	500
-performance_schema	threads.memory	1408000
-performance_schema	file_instances.row_size	704
-performance_schema	file_instances.row_count	23385
-performance_schema	file_instances.memory	16463040
-performance_schema	(pfs_file_handle).row_size	8
-performance_schema	(pfs_file_handle).row_count	32768
-performance_schema	(pfs_file_handle).memory	262144
-performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	191500
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	6128000
-performance_schema	(pfs_table_share).row_size	22208
-performance_schema	(pfs_table_share).row_count	12500
-performance_schema	(pfs_table_share).memory	277600000
-performance_schema	(pfs_table).row_size	9280
-performance_schema	(pfs_table).row_count	800
-performance_schema	(pfs_table).memory	7424000
-performance_schema	setup_actors.row_size	256
-performance_schema	setup_actors.row_count	100
-performance_schema	setup_actors.memory	25600
-performance_schema	setup_objects.row_size	448
-performance_schema	setup_objects.row_count	100
-performance_schema	setup_objects.memory	44800
-performance_schema	(pfs_account).row_size	256
-performance_schema	(pfs_account).row_count	100
-performance_schema	(pfs_account).memory	25600
-performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_account_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_user_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_host_by_event_name.memory	1225600
-performance_schema	(pfs_user).row_size	128
-performance_schema	(pfs_user).row_count	100
-performance_schema	(pfs_user).memory	12800
-performance_schema	(pfs_host).row_size	128
-performance_schema	(pfs_host).row_count	100
-performance_schema	(pfs_host).memory	12800
-performance_schema	(pfs_stage_class).row_size	256
-performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	38400
-performance_schema	events_stages_history.row_size	88
-performance_schema	events_stages_history.row_count	5000
-performance_schema	events_stages_history.memory	440000
-performance_schema	events_stages_history_long.row_size	88
-performance_schema	events_stages_history_long.row_count	10000
-performance_schema	events_stages_history_long.memory	880000
-performance_schema	events_stages_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_thread_by_event_name.row_count	75000
-performance_schema	events_stages_summary_by_thread_by_event_name.memory	2400000
-performance_schema	events_stages_summary_global_by_event_name.row_size	32
-performance_schema	events_stages_summary_global_by_event_name.row_count	150
-performance_schema	events_stages_summary_global_by_event_name.memory	4800
-performance_schema	events_stages_summary_by_account_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_account_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_account_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_user_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_user_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_user_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_host_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_host_by_event_name.memory	480000
-performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	168
-performance_schema	(pfs_statement_class).memory	32256
-performance_schema	events_statements_history.row_size	3024
-performance_schema	events_statements_history.row_count	5000
-performance_schema	events_statements_history.memory	15120000
-performance_schema	events_statements_history_long.row_size	3024
-performance_schema	events_statements_history_long.row_count	10000
-performance_schema	events_statements_history_long.memory	30240000
-performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	84000
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	15456000
-performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	168
-performance_schema	events_statements_summary_global_by_event_name.memory	30912
-performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_account_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_user_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_host_by_event_name.memory	3091200
-performance_schema	events_statements_current.row_size	3024
-performance_schema	events_statements_current.row_count	500
-performance_schema	events_statements_current.memory	1512000
-performance_schema	(pfs_socket_class).row_size	320
-performance_schema	(pfs_socket_class).row_count	10
-performance_schema	(pfs_socket_class).memory	3200
-performance_schema	socket_instances.row_size	320
-performance_schema	socket_instances.row_count	420
-performance_schema	socket_instances.memory	134400
-performance_schema	events_statements_summary_by_digest.row_size	1472
-performance_schema	events_statements_summary_by_digest.row_count	10000
-performance_schema	events_statements_summary_by_digest.memory	14720000
-performance_schema	session_connect_attrs.row_size	500
-performance_schema	session_connect_attrs.row_count	512
-performance_schema	session_connect_attrs.memory	256000
-performance_schema	(account_hash).count	2
-performance_schema	(account_hash).size	100
-performance_schema	(digest_hash).count	0
-performance_schema	(digest_hash).size	10000
-performance_schema	(filename_hash).count	0
-performance_schema	(filename_hash).size	23385
-performance_schema	(host_hash).count	2
-performance_schema	(host_hash).size	100
-performance_schema	(setup_actor_hash).count	1
-performance_schema	(setup_actor_hash).size	100
-performance_schema	(setup_object_hash).count	4
-performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	80
-performance_schema	(table_share_hash).size	12500
-performance_schema	(user_hash).count	2
-performance_schema	(user_hash).size	100
-performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	421925632
diff --git a/mysql-test/suite/perfschema/r/sizing_low.result b/mysql-test/suite/perfschema/r/sizing_low.result
index d5aab2c2df3..213cc0b5f74 100644
--- a/mysql-test/suite/perfschema/r/sizing_low.result
+++ b/mysql-test/suite/perfschema/r/sizing_low.result
@@ -7,7 +7,9 @@ table_open_cache	100
 show variables like "max_connections";
 Variable_name	Value
 max_connections	50
-show variables like "%performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	10
@@ -31,7 +33,6 @@ performance_schema_max_rwlock_instances	1612
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	67
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	112
 performance_schema_max_table_instances	445
 performance_schema_max_thread_classes	50
@@ -65,160 +66,3 @@ Performance_schema_table_instances_lost	0
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
-show engine performance_schema status;
-Type	Name	Status
-performance_schema	events_waits_current.row_size	184
-performance_schema	events_waits_current.row_count	672
-performance_schema	events_waits_history.row_size	184
-performance_schema	events_waits_history.row_count	560
-performance_schema	events_waits_history.memory	103040
-performance_schema	events_waits_history_long.row_size	184
-performance_schema	events_waits_history_long.row_count	100
-performance_schema	events_waits_history_long.memory	18400
-performance_schema	(pfs_mutex_class).row_size	256
-performance_schema	(pfs_mutex_class).row_count	200
-performance_schema	(pfs_mutex_class).memory	51200
-performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	40
-performance_schema	(pfs_rwlock_class).memory	12800
-performance_schema	(pfs_cond_class).row_size	256
-performance_schema	(pfs_cond_class).row_count	80
-performance_schema	(pfs_cond_class).memory	20480
-performance_schema	(pfs_thread_class).row_size	192
-performance_schema	(pfs_thread_class).row_count	50
-performance_schema	(pfs_thread_class).memory	9600
-performance_schema	(pfs_file_class).row_size	320
-performance_schema	(pfs_file_class).row_count	50
-performance_schema	(pfs_file_class).memory	16000
-performance_schema	mutex_instances.row_size	128
-performance_schema	mutex_instances.row_count	2945
-performance_schema	mutex_instances.memory	376960
-performance_schema	rwlock_instances.row_size	192
-performance_schema	rwlock_instances.row_count	1612
-performance_schema	rwlock_instances.memory	309504
-performance_schema	cond_instances.row_size	128
-performance_schema	cond_instances.row_count	612
-performance_schema	cond_instances.memory	78336
-performance_schema	threads.row_size	2816
-performance_schema	threads.row_count	112
-performance_schema	threads.memory	315392
-performance_schema	file_instances.row_size	704
-performance_schema	file_instances.row_count	1556
-performance_schema	file_instances.memory	1095424
-performance_schema	(pfs_file_handle).row_size	8
-performance_schema	(pfs_file_handle).row_count	32768
-performance_schema	(pfs_file_handle).memory	262144
-performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	42896
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	1372672
-performance_schema	(pfs_table_share).row_size	22208
-performance_schema	(pfs_table_share).row_count	445
-performance_schema	(pfs_table_share).memory	9882560
-performance_schema	(pfs_table).row_size	9280
-performance_schema	(pfs_table).row_count	112
-performance_schema	(pfs_table).memory	1039360
-performance_schema	setup_actors.row_size	256
-performance_schema	setup_actors.row_count	100
-performance_schema	setup_actors.memory	25600
-performance_schema	setup_objects.row_size	448
-performance_schema	setup_objects.row_count	100
-performance_schema	setup_objects.memory	44800
-performance_schema	(pfs_account).row_size	256
-performance_schema	(pfs_account).row_count	10
-performance_schema	(pfs_account).memory	2560
-performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	3830
-performance_schema	events_waits_summary_by_account_by_event_name.memory	122560
-performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	1915
-performance_schema	events_waits_summary_by_user_by_event_name.memory	61280
-performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	7660
-performance_schema	events_waits_summary_by_host_by_event_name.memory	245120
-performance_schema	(pfs_user).row_size	128
-performance_schema	(pfs_user).row_count	5
-performance_schema	(pfs_user).memory	640
-performance_schema	(pfs_host).row_size	128
-performance_schema	(pfs_host).row_count	20
-performance_schema	(pfs_host).memory	2560
-performance_schema	(pfs_stage_class).row_size	256
-performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	38400
-performance_schema	events_stages_history.row_size	88
-performance_schema	events_stages_history.row_count	560
-performance_schema	events_stages_history.memory	49280
-performance_schema	events_stages_history_long.row_size	88
-performance_schema	events_stages_history_long.row_count	100
-performance_schema	events_stages_history_long.memory	8800
-performance_schema	events_stages_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_thread_by_event_name.row_count	16800
-performance_schema	events_stages_summary_by_thread_by_event_name.memory	537600
-performance_schema	events_stages_summary_global_by_event_name.row_size	32
-performance_schema	events_stages_summary_global_by_event_name.row_count	150
-performance_schema	events_stages_summary_global_by_event_name.memory	4800
-performance_schema	events_stages_summary_by_account_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_account_by_event_name.row_count	1500
-performance_schema	events_stages_summary_by_account_by_event_name.memory	48000
-performance_schema	events_stages_summary_by_user_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_user_by_event_name.row_count	750
-performance_schema	events_stages_summary_by_user_by_event_name.memory	24000
-performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_host_by_event_name.row_count	3000
-performance_schema	events_stages_summary_by_host_by_event_name.memory	96000
-performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	168
-performance_schema	(pfs_statement_class).memory	32256
-performance_schema	events_statements_history.row_size	3024
-performance_schema	events_statements_history.row_count	560
-performance_schema	events_statements_history.memory	1693440
-performance_schema	events_statements_history_long.row_size	3024
-performance_schema	events_statements_history_long.row_count	100
-performance_schema	events_statements_history_long.memory	302400
-performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	18816
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	3462144
-performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	168
-performance_schema	events_statements_summary_global_by_event_name.memory	30912
-performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	1680
-performance_schema	events_statements_summary_by_account_by_event_name.memory	309120
-performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	840
-performance_schema	events_statements_summary_by_user_by_event_name.memory	154560
-performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	3360
-performance_schema	events_statements_summary_by_host_by_event_name.memory	618240
-performance_schema	events_statements_current.row_size	3024
-performance_schema	events_statements_current.row_count	112
-performance_schema	events_statements_current.memory	338688
-performance_schema	(pfs_socket_class).row_size	320
-performance_schema	(pfs_socket_class).row_count	10
-performance_schema	(pfs_socket_class).memory	3200
-performance_schema	socket_instances.row_size	320
-performance_schema	socket_instances.row_count	67
-performance_schema	socket_instances.memory	21440
-performance_schema	events_statements_summary_by_digest.row_size	1472
-performance_schema	events_statements_summary_by_digest.row_count	1000
-performance_schema	events_statements_summary_by_digest.memory	1472000
-performance_schema	session_connect_attrs.row_size	112
-performance_schema	session_connect_attrs.row_count	512
-performance_schema	session_connect_attrs.memory	57344
-performance_schema	(account_hash).count	2
-performance_schema	(account_hash).size	10
-performance_schema	(digest_hash).count	0
-performance_schema	(digest_hash).size	1000
-performance_schema	(filename_hash).count	0
-performance_schema	(filename_hash).size	1556
-performance_schema	(host_hash).count	2
-performance_schema	(host_hash).size	20
-performance_schema	(setup_actor_hash).count	1
-performance_schema	(setup_actor_hash).size	100
-performance_schema	(setup_object_hash).count	4
-performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	80
-performance_schema	(table_share_hash).size	445
-performance_schema	(user_hash).count	2
-performance_schema	(user_hash).size	5
-performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	24771616
diff --git a/mysql-test/suite/perfschema/r/sizing_med.result b/mysql-test/suite/perfschema/r/sizing_med.result
index c2e7a4df4bf..fbe703c5ff5 100644
--- a/mysql-test/suite/perfschema/r/sizing_med.result
+++ b/mysql-test/suite/perfschema/r/sizing_med.result
@@ -7,7 +7,9 @@ table_open_cache	401
 show variables like "max_connections";
 Variable_name	Value
 max_connections	152
-show variables like "%performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -31,7 +33,6 @@ performance_schema_max_rwlock_instances	2222
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	232
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	573
 performance_schema_max_table_instances	556
 performance_schema_max_thread_classes	50
@@ -65,160 +66,3 @@ Performance_schema_table_instances_lost	0
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
-show engine performance_schema status;
-Type	Name	Status
-performance_schema	events_waits_current.row_size	184
-performance_schema	events_waits_current.row_count	1734
-performance_schema	events_waits_history.row_size	184
-performance_schema	events_waits_history.row_count	2890
-performance_schema	events_waits_history.memory	531760
-performance_schema	events_waits_history_long.row_size	184
-performance_schema	events_waits_history_long.row_count	1000
-performance_schema	events_waits_history_long.memory	184000
-performance_schema	(pfs_mutex_class).row_size	256
-performance_schema	(pfs_mutex_class).row_count	200
-performance_schema	(pfs_mutex_class).memory	51200
-performance_schema	(pfs_rwlock_class).row_size	320
-performance_schema	(pfs_rwlock_class).row_count	40
-performance_schema	(pfs_rwlock_class).memory	12800
-performance_schema	(pfs_cond_class).row_size	256
-performance_schema	(pfs_cond_class).row_count	80
-performance_schema	(pfs_cond_class).memory	20480
-performance_schema	(pfs_thread_class).row_size	192
-performance_schema	(pfs_thread_class).row_count	50
-performance_schema	(pfs_thread_class).memory	9600
-performance_schema	(pfs_file_class).row_size	320
-performance_schema	(pfs_file_class).row_count	50
-performance_schema	(pfs_file_class).memory	16000
-performance_schema	mutex_instances.row_size	128
-performance_schema	mutex_instances.row_count	4230
-performance_schema	mutex_instances.memory	541440
-performance_schema	rwlock_instances.row_size	192
-performance_schema	rwlock_instances.row_count	2222
-performance_schema	rwlock_instances.memory	426624
-performance_schema	cond_instances.row_size	128
-performance_schema	cond_instances.row_count	1079
-performance_schema	cond_instances.memory	138112
-performance_schema	threads.row_size	2816
-performance_schema	threads.row_count	289
-performance_schema	threads.memory	813824
-performance_schema	file_instances.row_size	704
-performance_schema	file_instances.row_count	1754
-performance_schema	file_instances.memory	1234816
-performance_schema	(pfs_file_handle).row_size	8
-performance_schema	(pfs_file_handle).row_count	32768
-performance_schema	(pfs_file_handle).memory	262144
-performance_schema	events_waits_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_thread_by_event_name.row_count	110687
-performance_schema	events_waits_summary_by_thread_by_event_name.memory	3541984
-performance_schema	(pfs_table_share).row_size	22208
-performance_schema	(pfs_table_share).row_count	556
-performance_schema	(pfs_table_share).memory	12347648
-performance_schema	(pfs_table).row_size	9280
-performance_schema	(pfs_table).row_count	573
-performance_schema	(pfs_table).memory	5317440
-performance_schema	setup_actors.row_size	256
-performance_schema	setup_actors.row_count	100
-performance_schema	setup_actors.memory	25600
-performance_schema	setup_objects.row_size	448
-performance_schema	setup_objects.row_count	100
-performance_schema	setup_objects.memory	44800
-performance_schema	(pfs_account).row_size	256
-performance_schema	(pfs_account).row_count	100
-performance_schema	(pfs_account).memory	25600
-performance_schema	events_waits_summary_by_account_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_account_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_account_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_user_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_user_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_user_by_event_name.memory	1225600
-performance_schema	events_waits_summary_by_host_by_event_name.row_size	32
-performance_schema	events_waits_summary_by_host_by_event_name.row_count	38300
-performance_schema	events_waits_summary_by_host_by_event_name.memory	1225600
-performance_schema	(pfs_user).row_size	128
-performance_schema	(pfs_user).row_count	100
-performance_schema	(pfs_user).memory	12800
-performance_schema	(pfs_host).row_size	128
-performance_schema	(pfs_host).row_count	100
-performance_schema	(pfs_host).memory	12800
-performance_schema	(pfs_stage_class).row_size	256
-performance_schema	(pfs_stage_class).row_count	150
-performance_schema	(pfs_stage_class).memory	38400
-performance_schema	events_stages_history.row_size	88
-performance_schema	events_stages_history.row_count	2890
-performance_schema	events_stages_history.memory	254320
-performance_schema	events_stages_history_long.row_size	88
-performance_schema	events_stages_history_long.row_count	1000
-performance_schema	events_stages_history_long.memory	88000
-performance_schema	events_stages_summary_by_thread_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_thread_by_event_name.row_count	43350
-performance_schema	events_stages_summary_by_thread_by_event_name.memory	1387200
-performance_schema	events_stages_summary_global_by_event_name.row_size	32
-performance_schema	events_stages_summary_global_by_event_name.row_count	150
-performance_schema	events_stages_summary_global_by_event_name.memory	4800
-performance_schema	events_stages_summary_by_account_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_account_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_account_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_user_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_user_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_user_by_event_name.memory	480000
-performance_schema	events_stages_summary_by_host_by_event_name.row_size	32
-performance_schema	events_stages_summary_by_host_by_event_name.row_count	15000
-performance_schema	events_stages_summary_by_host_by_event_name.memory	480000
-performance_schema	(pfs_statement_class).row_size	192
-performance_schema	(pfs_statement_class).row_count	168
-performance_schema	(pfs_statement_class).memory	32256
-performance_schema	events_statements_history.row_size	3024
-performance_schema	events_statements_history.row_count	2890
-performance_schema	events_statements_history.memory	8739360
-performance_schema	events_statements_history_long.row_size	3024
-performance_schema	events_statements_history_long.row_count	1000
-performance_schema	events_statements_history_long.memory	3024000
-performance_schema	events_statements_summary_by_thread_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_thread_by_event_name.row_count	48552
-performance_schema	events_statements_summary_by_thread_by_event_name.memory	8933568
-performance_schema	events_statements_summary_global_by_event_name.row_size	184
-performance_schema	events_statements_summary_global_by_event_name.row_count	168
-performance_schema	events_statements_summary_global_by_event_name.memory	30912
-performance_schema	events_statements_summary_by_account_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_account_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_account_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_user_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_user_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_user_by_event_name.memory	3091200
-performance_schema	events_statements_summary_by_host_by_event_name.row_size	184
-performance_schema	events_statements_summary_by_host_by_event_name.row_count	16800
-performance_schema	events_statements_summary_by_host_by_event_name.memory	3091200
-performance_schema	events_statements_current.row_size	3024
-performance_schema	events_statements_current.row_count	289
-performance_schema	events_statements_current.memory	873936
-performance_schema	(pfs_socket_class).row_size	320
-performance_schema	(pfs_socket_class).row_count	10
-performance_schema	(pfs_socket_class).memory	3200
-performance_schema	socket_instances.row_size	320
-performance_schema	socket_instances.row_count	232
-performance_schema	socket_instances.memory	74240
-performance_schema	events_statements_summary_by_digest.row_size	1472
-performance_schema	events_statements_summary_by_digest.row_count	5000
-performance_schema	events_statements_summary_by_digest.memory	7360000
-performance_schema	session_connect_attrs.row_size	289
-performance_schema	session_connect_attrs.row_count	512
-performance_schema	session_connect_attrs.memory	147968
-performance_schema	(account_hash).count	2
-performance_schema	(account_hash).size	100
-performance_schema	(digest_hash).count	0
-performance_schema	(digest_hash).size	5000
-performance_schema	(filename_hash).count	0
-performance_schema	(filename_hash).size	1754
-performance_schema	(host_hash).count	2
-performance_schema	(host_hash).size	100
-performance_schema	(setup_actor_hash).count	1
-performance_schema	(setup_actor_hash).size	100
-performance_schema	(setup_object_hash).count	4
-performance_schema	(setup_object_hash).size	100
-performance_schema	(table_share_hash).count	80
-performance_schema	(table_share_hash).size	556
-performance_schema	(user_hash).count	2
-performance_schema	(user_hash).size	100
-performance_schema	host_cache.size	336
-performance_schema	performance_schema.memory	70954032
diff --git a/mysql-test/suite/perfschema/r/sizing_off.result b/mysql-test/suite/perfschema/r/sizing_off.result
index 0d95a8c0f1b..614ad7d2475 100644
--- a/mysql-test/suite/perfschema/r/sizing_off.result
+++ b/mysql-test/suite/perfschema/r/sizing_off.result
@@ -1,4 +1,6 @@
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	OFF
 performance_schema_accounts_size	-1
@@ -22,7 +24,6 @@ performance_schema_max_rwlock_instances	-1
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	-1
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	-1
 performance_schema_max_table_instances	-1
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_idle.result b/mysql-test/suite/perfschema/r/start_server_disable_idle.result
index 9f22ca75162..9e0b9209b89 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_stages.result b/mysql-test/suite/perfschema/r/start_server_disable_stages.result
index d73d7920cd7..99b18e851a4 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_statements.result b/mysql-test/suite/perfschema/r/start_server_disable_statements.result
index af5fbb00d15..5217f16a32f 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_waits.result b/mysql-test/suite/perfschema/r/start_server_disable_waits.result
index 92f50e0a699..86c25348cd5 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result
index ac5d03945c2..d03c20a5878 100644
--- a/mysql-test/suite/perfschema/r/start_server_innodb.result
+++ b/mysql-test/suite/perfschema/r/start_server_innodb.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_low_digest.result b/mysql-test/suite/perfschema/r/start_server_low_digest.result
new file mode 100644
index 00000000000..d7eccb16445
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_low_digest.result
@@ -0,0 +1,12 @@
+USE performance_schema;
+truncate table events_statements_history_long;
+SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1;
+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
+74
+####################################
+# QUERYING PS STATEMENT DIGEST
+####################################
+SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
+event_name	digest	digest_text	sql_text
+statement/sql/truncate	23e0e19c4baa66c6be30e70f75e52178	TRUNCATE TABLE 	truncate table events_statements_history_long
+statement/sql/select	6695eca04b8387c092d89fa88d767328	SELECT ? + ? + 	SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result
index d45e9a77910..3e0324868a7 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_account.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_account.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	0
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
index fb7eb60c915..158dfb81ebe 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
index 3fa4ed1a43d..3673600a078 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_class.result b/mysql-test/suite/perfschema/r/start_server_no_file_class.result
index 6079cb7fbdf..1e819d26265 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_file_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_class.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result
index 786c8a6cb96..b439af66f8d 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_file_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_file_inst.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_host.result b/mysql-test/suite/perfschema/r/start_server_no_host.result
index 26b736922fe..abb8a157ec6 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_host.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_host.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
index 77210f4253f..c5fe555b749 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
index ca2ce3114c9..d88d808a9ab 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
index 252c6c7f0aa..1155993e60c 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
index e7655a314ea..4d419817b0a 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	0
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
index 48c0574912f..281ca17491c 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
index aecc8fa1bd0..1e5578daddc 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result
index d247a9b148d..ef1050d9fde 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_socket_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_socket_class.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	0
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
index 6682121bd99..97cbc807f3c 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_socket_inst.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	0
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result
index 41275012bfa..a173447632d 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_stage_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_stage_class.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	0
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result
index 0e367945cfc..6de6cc3187e 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_stages_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
index aa3de1ab7cd..fc0e680ebb7 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result
index 78fe9223ef4..fca5ab82238 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_statement_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_statement_class.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	0
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result
index d890992ac83..1fc13bf6ce3 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_statements_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
index 62b3290d7ed..d51d3acf343 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_statements_history_long.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
index 0e5837c9eaf..784ed74e33c 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result
index 72347f14160..da73df5c419 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_table_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_inst.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result
index e5dd500c316..a84f0f3c0ef 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_class.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_class.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	0
diff --git a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
index d36c2b30441..3be29053b33 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_user.result b/mysql-test/suite/perfschema/r/start_server_no_user.result
index 89efe84d938..d80a9a4a2c4 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_user.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_user.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result
index 81e999bc0ee..928307123d8 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_waits_history.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
index bca3594c225..d8ada5f9da5 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_waits_history_long.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result
index 4e6994d670e..bf84848641c 100644
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	0
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	0
 performance_schema_max_socket_classes	0
 performance_schema_max_socket_instances	0
 performance_schema_max_stage_classes	0
-performance_schema_max_statement_classes	0
 performance_schema_max_table_handles	0
 performance_schema_max_table_instances	0
 performance_schema_max_thread_classes	0
diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result
index f5249dc2039..293607c41e9 100644
--- a/mysql-test/suite/perfschema/r/start_server_off.result
+++ b/mysql-test/suite/perfschema/r/start_server_off.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	OFF
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result
index ac5d03945c2..d03c20a5878 100644
--- a/mysql-test/suite/perfschema/r/start_server_on.result
+++ b/mysql-test/suite/perfschema/r/start_server_on.result
@@ -69,7 +69,9 @@ select * from performance_schema.table_io_waits_summary_by_table;
 select * from performance_schema.table_lock_waits_summary_by_table;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -93,7 +95,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result
index 699add920d2..f3b2b86e835 100644
--- a/mysql-test/suite/perfschema/r/statement_digest.result
+++ b/mysql-test/suite/perfschema/r/statement_digest.result
@@ -118,7 +118,7 @@ statements_digest	835083efbaa5d8c29d01d558abb8216b	SELECT ? FROM `t1` 	1	0	0	0
 statements_digest	6ff375c6f4b283de91711a78bd91b953	SELECT ?, ... FROM t1 	2	0	0	0
 statements_digest	4879fbad051c94ff76e6ad29effa4903	SELECT ? FROM t2 	1	0	0	0
 statements_digest	b1ea4bca7c91ebd647b6b81e80a2ef94	SELECT ?, ... FROM t2 	2	0	0	0
-statements_digest	14d463345df747d42a036019a5988a9b	INSERT INTO t1 VALUES (?) 	1	1	0	0
+statements_digest	14d463345df747d42a036019a5988a9b	INSERT INTO t1 VALUES (?) 	2	2	0	0
 statements_digest	ff2d8aa1fd516f5e25b0faf7b1c80b04	INSERT INTO t2 VALUES (?) 	1	1	0	0
 statements_digest	430116339c3a5bf0a1aa9a96e9cfd354	INSERT INTO t3 VALUES (...) 	4	4	0	0
 statements_digest	01467137a1045e85119538ea248d52dd	INSERT INTO t4 VALUES (...) 	1	1	0	0
@@ -126,7 +126,6 @@ statements_digest	b201a20a2a534d2789750270b7f90fab	INSERT INTO t5 VALUES (...)
 statements_digest	b1a5f24770580f243ad6704590165d90	INSERT INTO t1 VALUES (?) /* , ... */ 	2	7	0	0
 statements_digest	bbbf619ec8ca4ec4a4da28a71eb12a2f	INSERT INTO t3 VALUES (...) /* , ... */ 	1	3	0	0
 statements_digest	de7bdb298875f4ef826383e3fce53ef9	INSERT INTO t5 VALUES (...) /* , ... */ 	1	3	0	0
-statements_digest	f79cdc2ddca01e9ea89782b3548b01e3	INSERT INTO t1 VALUES ( NULL ) 	1	1	0	0
 statements_digest	cd4a3e419e2eaed79f66a705ff002910	INSERT INTO t6 VALUES (...) 	5	5	0	0
 statements_digest	f2d57cea9e78e7b37c4509c0564dd1cc	SELECT ? + ? 	3	0	0	0
 statements_digest	02396199eed2345830efcf00e51107ee	SELECT ? 	1	0	0	0
@@ -146,7 +145,7 @@ statements_digest	efc046c5d04acb8afa61326f759ad380	DROP PROCEDURE p1 	1	0	0	0
 statements_digest	8eaf9e776b79f24f2b8fae8efb92d8a4	CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 	1	0	0	0
 statements_digest	b364c71d8c904eb9e95df4d0ca258c00	SELECT func (...) 	2	0	0	0
 statements_digest	88e7ac9784e4561d12fadccde6ea704a	DROP FUNCTION func 	1	0	0	0
-statements_digest	15deeaae5594a691cf21abd4439ee5e6	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 	1	0	0	0
+statements_digest	15deeaae5594a691cf21abd4439ee5e6	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 	1	0	0	0
 statements_digest	074e38814943a6dce874784d21fea89d	INSERT INTO t12 VALUES (?) 	2	2	0	0
 statements_digest	2b5b02ba54b27638d5d8dbe917ff432d	DROP TRIGGER trg 	1	0	0	0
 ####################################
diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
index 3f5b730510b..327fa5a693b 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
@@ -131,7 +131,7 @@ statements_digest	835083efbaa5d8c29d01d558abb8216b	SELECT ? FROM `t1` 	1
 statements_digest	6ff375c6f4b283de91711a78bd91b953	SELECT ?, ... FROM t1 	2
 statements_digest	4879fbad051c94ff76e6ad29effa4903	SELECT ? FROM t2 	1
 statements_digest	b1ea4bca7c91ebd647b6b81e80a2ef94	SELECT ?, ... FROM t2 	2
-statements_digest	14d463345df747d42a036019a5988a9b	INSERT INTO t1 VALUES (?) 	1
+statements_digest	14d463345df747d42a036019a5988a9b	INSERT INTO t1 VALUES (?) 	2
 statements_digest	ff2d8aa1fd516f5e25b0faf7b1c80b04	INSERT INTO t2 VALUES (?) 	1
 statements_digest	430116339c3a5bf0a1aa9a96e9cfd354	INSERT INTO t3 VALUES (...) 	4
 statements_digest	01467137a1045e85119538ea248d52dd	INSERT INTO t4 VALUES (...) 	1
@@ -139,7 +139,6 @@ statements_digest	b201a20a2a534d2789750270b7f90fab	INSERT INTO t5 VALUES (...)
 statements_digest	b1a5f24770580f243ad6704590165d90	INSERT INTO t1 VALUES (?) /* , ... */ 	2
 statements_digest	bbbf619ec8ca4ec4a4da28a71eb12a2f	INSERT INTO t3 VALUES (...) /* , ... */ 	1
 statements_digest	de7bdb298875f4ef826383e3fce53ef9	INSERT INTO t5 VALUES (...) /* , ... */ 	1
-statements_digest	f79cdc2ddca01e9ea89782b3548b01e3	INSERT INTO t1 VALUES ( NULL ) 	1
 statements_digest	cd4a3e419e2eaed79f66a705ff002910	INSERT INTO t6 VALUES (...) 	5
 statements_digest	f2d57cea9e78e7b37c4509c0564dd1cc	SELECT ? + ? 	3
 statements_digest	02396199eed2345830efcf00e51107ee	SELECT ? 	1
@@ -159,7 +158,7 @@ statements_digest	efc046c5d04acb8afa61326f759ad380	DROP PROCEDURE p1 	1
 statements_digest	8eaf9e776b79f24f2b8fae8efb92d8a4	CREATE FUNCTION `func` ( a INTEGER , b INTEGER ) RETURNS INTEGER (?) RETURN a + b 	1
 statements_digest	b364c71d8c904eb9e95df4d0ca258c00	SELECT func (...) 	2
 statements_digest	88e7ac9784e4561d12fadccde6ea704a	DROP FUNCTION func 	1
-statements_digest	15deeaae5594a691cf21abd4439ee5e6	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @ ? := ? 	1
+statements_digest	15deeaae5594a691cf21abd4439ee5e6	CREATE TRIGGER trg BEFORE INSERT ON t12 FOR EACH ROW SET @? := ? 	1
 statements_digest	074e38814943a6dce874784d21fea89d	INSERT INTO t12 VALUES (?) 	2
 statements_digest	2b5b02ba54b27638d5d8dbe917ff432d	DROP TRIGGER trg 	1
 SELECT digest, digest_text FROM performance_schema.events_statements_current;
diff --git a/mysql-test/suite/perfschema/r/statement_digest_long_query.result b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
index 9dee9dd481b..c659f119dcb 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
@@ -9,4 +9,4 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 SELECT schema_name, digest, digest_text, count_star FROM events_statements_summary_by_digest;
 schema_name	digest	digest_text	count_star
 performance_schema	e8d937c7ecf79e105de0f9e364fa5edb	TRUNCATE TABLE events_statements_summary_by_digest 	1
-performance_schema	5d9a2f95653d8ca9d9cea3eefff7e361	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ...	1
+performance_schema	5d9a2f95653d8ca9d9cea3eefff7e361	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? 	1
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
index e59a03324dd..b8fd5818439 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_2t.result
@@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
index bb1fc975cd9..3f107e03ec2 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result
@@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
index ae067698e2d..5223b6a0ec6 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result
@@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
index 333d3844867..2ec3e34ec39 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result
@@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
index 61af4a203c9..8627610b78e 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
@@ -37,7 +37,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -61,7 +63,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
index ba109d45783..5bf0b8fdd49 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
@@ -36,7 +36,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -60,7 +62,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
index f19d737061d..5ca74aa58b1 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
@@ -37,7 +37,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -61,7 +63,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
index 05c4be28be3..a4bf01f29de 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
@@ -36,7 +36,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -60,7 +62,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result
index 50935c7afbe..f28f374c5dd 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_off.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result
@@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
index 83345b6edda..3223cf89dbf 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
@@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
index b53f0696f56..e2b7a7aeae9 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
@@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
index 3b8f6326031..21e44d92d69 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
@@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
index 023ff3760c7..46cfd6fd788 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
@@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
index df42b39c726..ae58adbc560 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result
@@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
index 30b48d59253..f5c6bde55e6 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
@@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
index 4804265562c..fd4788bfc89 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
@@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
index 086957fa25e..5515f4939b6 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
@@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
index 08356e894da..c9d5130e1bd 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
@@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
index e60acb62ff7..6ff11b5a757 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result
@@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
index 5593fd8ec85..d7c744b5c4a 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result
@@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
index 0fd700c86ac..52d8513f288 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result
@@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
index c4c98c1143f..68a1e6d259b 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result
@@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
index 3563e7bb366..87936072baf 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
@@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
index 0cf5970111d..ed7aa4f2391 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
@@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
index c94d2192f22..1600b989199 100644
--- a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
@@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
index 84074f4d0ce..d3a4416fdfd 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result
@@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
index 413b70c17bd..c69fc8a37d3 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result
@@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
index dfa300a09ed..91110a94be5 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result
@@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
index b4ca5202558..b443ac28c17 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result
@@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
index 50aeea5363a..08a107acb2a 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result
@@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
index eeea805e941..07272c6e204 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result
@@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
index ce9e0aeff85..77c52780ae9 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result
@@ -39,7 +39,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -63,7 +65,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
index 2ecd7d56411..6d7192285e3 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result
@@ -38,7 +38,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -62,7 +64,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
index 372ed695675..160be444e7c 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result
@@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
index 3f1e78a46da..e915a8dfa95 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
@@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
index d88e8f4d49a..82c1b65acff 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
@@ -41,7 +41,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -65,7 +67,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
diff --git a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
index 7b90426f3f8..9023a4b0a69 100644
--- a/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
@@ -40,7 +40,9 @@ truncate performance_schema.events_waits_summary_by_user_by_event_name;
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 truncate performance_schema.events_waits_summary_global_by_event_name;
 truncate performance_schema.events_waits_history_long;
-show variables like "performance_schema%";
+show variables where
+`Variable_name` != "performance_schema_max_statement_classes" and
+`Variable_name` like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -64,7 +66,6 @@ performance_schema_max_rwlock_instances	5000
 performance_schema_max_socket_classes	10
 performance_schema_max_socket_instances	1000
 performance_schema_max_stage_classes	150
-performance_schema_max_statement_classes	168
 performance_schema_max_table_handles	1000
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50