WL#2360 Performance schema

Part IV: sql instrumentation

17 files changed, 378 insertions, 8 deletions

diff --git a/mysql-test/suite/sys_vars/r/all_vars.result b/mysql-test/suite/sys_vars/r/all_vars.result
index abd1f5d2bd6..0f741ff930a 100644
--- a/mysql-test/suite/sys_vars/r/all_vars.result
+++ b/mysql-test/suite/sys_vars/r/all_vars.result
@@ -1,12 +1,14 @@
 create table t1 (test_name text);
+create table t2 (variable_name text);
 load data infile "MYSQLTEST_VARDIR/tmp/sys_vars.all_vars.txt" into table t1;
-select variable_name as `There should be *no* variables listed below:`
-                    from information_schema.global_variables
-left join t1 on variable_name=test_name where
-test_name is null
-union
-select variable_name from information_schema.session_variables
-left join t1 on variable_name=test_name where
-test_name is null;
+insert into t2 select variable_name from information_schema.global_variables;
+insert into t2 select variable_name from information_schema.session_variables;
+update t2 set variable_name= replace(variable_name, "PERFORMANCE_SCHEMA_", "PFS_");
+select variable_name as `There should be *no* long test name listed below:` from t2
+where length(variable_name) > 50;
+There should be *no* long test name listed below:
+select variable_name as `There should be *no* variables listed below:` from t2
+left join t1 on variable_name=test_name where test_name is null;
 There should be *no* variables listed below:
 drop table t1;
+drop table t2;
diff --git a/mysql-test/suite/sys_vars/r/performance_schema_basic.result b/mysql-test/suite/sys_vars/r/performance_schema_basic.result
new file mode 100644
index 00000000000..d494b64502b
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/performance_schema_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema;
+@@global.performance_schema
+1
+select @@session.performance_schema;
+ERROR HY000: Variable 'performance_schema' is a GLOBAL variable
+show global variables like 'performance_schema';
+Variable_name	Value
+performance_schema	ON
+show session variables like 'performance_schema';
+Variable_name	Value
+performance_schema	ON
+select * from information_schema.global_variables
+where variable_name='performance_schema';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA	ON
+select * from information_schema.session_variables
+where variable_name='performance_schema';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA	ON
+set global performance_schema=1;
+ERROR HY000: Variable 'performance_schema' is a read only variable
+set session performance_schema=1;
+ERROR HY000: Variable 'performance_schema' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_events_waits_history_long_size_basic.result b/mysql-test/suite/sys_vars/r/pfs_events_waits_history_long_size_basic.result
new file mode 100644
index 00000000000..6aa1b0b6325
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_events_waits_history_long_size_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_events_waits_history_long_size;
+@@global.performance_schema_events_waits_history_long_size
+15000
+select @@session.performance_schema_events_waits_history_long_size;
+ERROR HY000: Variable 'performance_schema_events_waits_history_long_size' is a GLOBAL variable
+show global variables like 'performance_schema_events_waits_history_long_size';
+Variable_name	Value
+performance_schema_events_waits_history_long_size	15000
+show session variables like 'performance_schema_events_waits_history_long_size';
+Variable_name	Value
+performance_schema_events_waits_history_long_size	15000
+select * from information_schema.global_variables
+where variable_name='performance_schema_events_waits_history_long_size';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE	15000
+select * from information_schema.session_variables
+where variable_name='performance_schema_events_waits_history_long_size';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE	15000
+set global performance_schema_events_waits_history_long_size=1;
+ERROR HY000: Variable 'performance_schema_events_waits_history_long_size' is a read only variable
+set session performance_schema_events_waits_history_long_size=1;
+ERROR HY000: Variable 'performance_schema_events_waits_history_long_size' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_events_waits_history_size_basic.result b/mysql-test/suite/sys_vars/r/pfs_events_waits_history_size_basic.result
new file mode 100644
index 00000000000..defa4eca1d4
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_events_waits_history_size_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_events_waits_history_size;
+@@global.performance_schema_events_waits_history_size
+15
+select @@session.performance_schema_events_waits_history_size;
+ERROR HY000: Variable 'performance_schema_events_waits_history_size' is a GLOBAL variable
+show global variables like 'performance_schema_events_waits_history_size';
+Variable_name	Value
+performance_schema_events_waits_history_size	15
+show session variables like 'performance_schema_events_waits_history_size';
+Variable_name	Value
+performance_schema_events_waits_history_size	15
+select * from information_schema.global_variables
+where variable_name='performance_schema_events_waits_history_size';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE	15
+select * from information_schema.session_variables
+where variable_name='performance_schema_events_waits_history_size';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE	15
+set global performance_schema_events_waits_history_size=1;
+ERROR HY000: Variable 'performance_schema_events_waits_history_size' is a read only variable
+set session performance_schema_events_waits_history_size=1;
+ERROR HY000: Variable 'performance_schema_events_waits_history_size' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_cond_classes_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_cond_classes_basic.result
new file mode 100644
index 00000000000..ec980a90cbd
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_cond_classes_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_cond_classes;
+@@global.performance_schema_max_cond_classes
+123
+select @@session.performance_schema_max_cond_classes;
+ERROR HY000: Variable 'performance_schema_max_cond_classes' is a GLOBAL variable
+show global variables like 'performance_schema_max_cond_classes';
+Variable_name	Value
+performance_schema_max_cond_classes	123
+show session variables like 'performance_schema_max_cond_classes';
+Variable_name	Value
+performance_schema_max_cond_classes	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_cond_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_COND_CLASSES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_cond_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_COND_CLASSES	123
+set global performance_schema_max_cond_classes=1;
+ERROR HY000: Variable 'performance_schema_max_cond_classes' is a read only variable
+set session performance_schema_max_cond_classes=1;
+ERROR HY000: Variable 'performance_schema_max_cond_classes' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_cond_instances_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_cond_instances_basic.result
new file mode 100644
index 00000000000..5bdb24ed0b8
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_cond_instances_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_cond_instances;
+@@global.performance_schema_max_cond_instances
+123
+select @@session.performance_schema_max_cond_instances;
+ERROR HY000: Variable 'performance_schema_max_cond_instances' is a GLOBAL variable
+show global variables like 'performance_schema_max_cond_instances';
+Variable_name	Value
+performance_schema_max_cond_instances	123
+show session variables like 'performance_schema_max_cond_instances';
+Variable_name	Value
+performance_schema_max_cond_instances	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_cond_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_COND_INSTANCES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_cond_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_COND_INSTANCES	123
+set global performance_schema_max_cond_instances=1;
+ERROR HY000: Variable 'performance_schema_max_cond_instances' is a read only variable
+set session performance_schema_max_cond_instances=1;
+ERROR HY000: Variable 'performance_schema_max_cond_instances' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_file_classes_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_file_classes_basic.result
new file mode 100644
index 00000000000..47eaa449106
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_file_classes_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_file_classes;
+@@global.performance_schema_max_file_classes
+123
+select @@session.performance_schema_max_file_classes;
+ERROR HY000: Variable 'performance_schema_max_file_classes' is a GLOBAL variable
+show global variables like 'performance_schema_max_file_classes';
+Variable_name	Value
+performance_schema_max_file_classes	123
+show session variables like 'performance_schema_max_file_classes';
+Variable_name	Value
+performance_schema_max_file_classes	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_file_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_FILE_CLASSES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_file_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_FILE_CLASSES	123
+set global performance_schema_max_file_classes=1;
+ERROR HY000: Variable 'performance_schema_max_file_classes' is a read only variable
+set session performance_schema_max_file_classes=1;
+ERROR HY000: Variable 'performance_schema_max_file_classes' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_file_handles_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_file_handles_basic.result
new file mode 100644
index 00000000000..7d210ea3103
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_file_handles_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_file_handles;
+@@global.performance_schema_max_file_handles
+123
+select @@session.performance_schema_max_file_handles;
+ERROR HY000: Variable 'performance_schema_max_file_handles' is a GLOBAL variable
+show global variables like 'performance_schema_max_file_handles';
+Variable_name	Value
+performance_schema_max_file_handles	123
+show session variables like 'performance_schema_max_file_handles';
+Variable_name	Value
+performance_schema_max_file_handles	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_file_handles';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_FILE_HANDLES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_file_handles';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_FILE_HANDLES	123
+set global performance_schema_max_file_handles=1;
+ERROR HY000: Variable 'performance_schema_max_file_handles' is a read only variable
+set session performance_schema_max_file_handles=1;
+ERROR HY000: Variable 'performance_schema_max_file_handles' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_file_instances_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_file_instances_basic.result
new file mode 100644
index 00000000000..097d4c14ed1
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_file_instances_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_file_instances;
+@@global.performance_schema_max_file_instances
+123
+select @@session.performance_schema_max_file_instances;
+ERROR HY000: Variable 'performance_schema_max_file_instances' is a GLOBAL variable
+show global variables like 'performance_schema_max_file_instances';
+Variable_name	Value
+performance_schema_max_file_instances	123
+show session variables like 'performance_schema_max_file_instances';
+Variable_name	Value
+performance_schema_max_file_instances	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_file_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_file_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES	123
+set global performance_schema_max_file_instances=1;
+ERROR HY000: Variable 'performance_schema_max_file_instances' is a read only variable
+set session performance_schema_max_file_instances=1;
+ERROR HY000: Variable 'performance_schema_max_file_instances' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_mutex_classes_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_mutex_classes_basic.result
new file mode 100644
index 00000000000..f2b75ef9540
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_mutex_classes_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_mutex_classes;
+@@global.performance_schema_max_mutex_classes
+123
+select @@session.performance_schema_max_mutex_classes;
+ERROR HY000: Variable 'performance_schema_max_mutex_classes' is a GLOBAL variable
+show global variables like 'performance_schema_max_mutex_classes';
+Variable_name	Value
+performance_schema_max_mutex_classes	123
+show session variables like 'performance_schema_max_mutex_classes';
+Variable_name	Value
+performance_schema_max_mutex_classes	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_mutex_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_mutex_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES	123
+set global performance_schema_max_mutex_classes=1;
+ERROR HY000: Variable 'performance_schema_max_mutex_classes' is a read only variable
+set session performance_schema_max_mutex_classes=1;
+ERROR HY000: Variable 'performance_schema_max_mutex_classes' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_mutex_instances_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_mutex_instances_basic.result
new file mode 100644
index 00000000000..f12fa6ace03
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_mutex_instances_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_mutex_instances;
+@@global.performance_schema_max_mutex_instances
+123
+select @@session.performance_schema_max_mutex_instances;
+ERROR HY000: Variable 'performance_schema_max_mutex_instances' is a GLOBAL variable
+show global variables like 'performance_schema_max_mutex_instances';
+Variable_name	Value
+performance_schema_max_mutex_instances	123
+show session variables like 'performance_schema_max_mutex_instances';
+Variable_name	Value
+performance_schema_max_mutex_instances	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_mutex_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_mutex_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES	123
+set global performance_schema_max_mutex_instances=1;
+ERROR HY000: Variable 'performance_schema_max_mutex_instances' is a read only variable
+set session performance_schema_max_mutex_instances=1;
+ERROR HY000: Variable 'performance_schema_max_mutex_instances' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_rwlock_classes_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_rwlock_classes_basic.result
new file mode 100644
index 00000000000..6c2d4b773c0
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_rwlock_classes_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_rwlock_classes;
+@@global.performance_schema_max_rwlock_classes
+123
+select @@session.performance_schema_max_rwlock_classes;
+ERROR HY000: Variable 'performance_schema_max_rwlock_classes' is a GLOBAL variable
+show global variables like 'performance_schema_max_rwlock_classes';
+Variable_name	Value
+performance_schema_max_rwlock_classes	123
+show session variables like 'performance_schema_max_rwlock_classes';
+Variable_name	Value
+performance_schema_max_rwlock_classes	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_rwlock_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_rwlock_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES	123
+set global performance_schema_max_rwlock_classes=1;
+ERROR HY000: Variable 'performance_schema_max_rwlock_classes' is a read only variable
+set session performance_schema_max_rwlock_classes=1;
+ERROR HY000: Variable 'performance_schema_max_rwlock_classes' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_rwlock_instances_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_rwlock_instances_basic.result
new file mode 100644
index 00000000000..169387d369d
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_rwlock_instances_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_rwlock_instances;
+@@global.performance_schema_max_rwlock_instances
+123
+select @@session.performance_schema_max_rwlock_instances;
+ERROR HY000: Variable 'performance_schema_max_rwlock_instances' is a GLOBAL variable
+show global variables like 'performance_schema_max_rwlock_instances';
+Variable_name	Value
+performance_schema_max_rwlock_instances	123
+show session variables like 'performance_schema_max_rwlock_instances';
+Variable_name	Value
+performance_schema_max_rwlock_instances	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_rwlock_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_rwlock_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES	123
+set global performance_schema_max_rwlock_instances=1;
+ERROR HY000: Variable 'performance_schema_max_rwlock_instances' is a read only variable
+set session performance_schema_max_rwlock_instances=1;
+ERROR HY000: Variable 'performance_schema_max_rwlock_instances' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_table_handles_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_table_handles_basic.result
new file mode 100644
index 00000000000..5f661b0ecdd
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_table_handles_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_table_handles;
+@@global.performance_schema_max_table_handles
+123
+select @@session.performance_schema_max_table_handles;
+ERROR HY000: Variable 'performance_schema_max_table_handles' is a GLOBAL variable
+show global variables like 'performance_schema_max_table_handles';
+Variable_name	Value
+performance_schema_max_table_handles	123
+show session variables like 'performance_schema_max_table_handles';
+Variable_name	Value
+performance_schema_max_table_handles	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_table_handles';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_table_handles';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES	123
+set global performance_schema_max_table_handles=1;
+ERROR HY000: Variable 'performance_schema_max_table_handles' is a read only variable
+set session performance_schema_max_table_handles=1;
+ERROR HY000: Variable 'performance_schema_max_table_handles' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_table_instances_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_table_instances_basic.result
new file mode 100644
index 00000000000..8497527abb5
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_table_instances_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_table_instances;
+@@global.performance_schema_max_table_instances
+123
+select @@session.performance_schema_max_table_instances;
+ERROR HY000: Variable 'performance_schema_max_table_instances' is a GLOBAL variable
+show global variables like 'performance_schema_max_table_instances';
+Variable_name	Value
+performance_schema_max_table_instances	123
+show session variables like 'performance_schema_max_table_instances';
+Variable_name	Value
+performance_schema_max_table_instances	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_table_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_table_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES	123
+set global performance_schema_max_table_instances=1;
+ERROR HY000: Variable 'performance_schema_max_table_instances' is a read only variable
+set session performance_schema_max_table_instances=1;
+ERROR HY000: Variable 'performance_schema_max_table_instances' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_thread_classes_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_thread_classes_basic.result
new file mode 100644
index 00000000000..9d45e13b46e
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_thread_classes_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_thread_classes;
+@@global.performance_schema_max_thread_classes
+123
+select @@session.performance_schema_max_thread_classes;
+ERROR HY000: Variable 'performance_schema_max_thread_classes' is a GLOBAL variable
+show global variables like 'performance_schema_max_thread_classes';
+Variable_name	Value
+performance_schema_max_thread_classes	123
+show session variables like 'performance_schema_max_thread_classes';
+Variable_name	Value
+performance_schema_max_thread_classes	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_thread_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_thread_classes';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES	123
+set global performance_schema_max_thread_classes=1;
+ERROR HY000: Variable 'performance_schema_max_thread_classes' is a read only variable
+set session performance_schema_max_thread_classes=1;
+ERROR HY000: Variable 'performance_schema_max_thread_classes' is a read only variable
diff --git a/mysql-test/suite/sys_vars/r/pfs_max_thread_instances_basic.result b/mysql-test/suite/sys_vars/r/pfs_max_thread_instances_basic.result
new file mode 100644
index 00000000000..dbb3967ad33
--- /dev/null
+++ b/mysql-test/suite/sys_vars/r/pfs_max_thread_instances_basic.result
@@ -0,0 +1,23 @@
+select @@global.performance_schema_max_thread_instances;
+@@global.performance_schema_max_thread_instances
+123
+select @@session.performance_schema_max_thread_instances;
+ERROR HY000: Variable 'performance_schema_max_thread_instances' is a GLOBAL variable
+show global variables like 'performance_schema_max_thread_instances';
+Variable_name	Value
+performance_schema_max_thread_instances	123
+show session variables like 'performance_schema_max_thread_instances';
+Variable_name	Value
+performance_schema_max_thread_instances	123
+select * from information_schema.global_variables
+where variable_name='performance_schema_max_thread_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES	123
+select * from information_schema.session_variables
+where variable_name='performance_schema_max_thread_instances';
+VARIABLE_NAME	VARIABLE_VALUE
+PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES	123
+set global performance_schema_max_thread_instances=1;
+ERROR HY000: Variable 'performance_schema_max_thread_instances' is a read only variable
+set session performance_schema_max_thread_instances=1;
+ERROR HY000: Variable 'performance_schema_max_thread_instances' is a read only variable