Merge branch '10.9' into 10.10

84 files changed, 594 insertions, 594 deletions

diff --git a/mysql-test/suite/perfschema/r/connect_attrs.result b/mysql-test/suite/perfschema/r/connect_attrs.result
index eb83cb5e886..aa61eb306a2 100644
--- a/mysql-test/suite/perfschema/r/connect_attrs.result
+++ b/mysql-test/suite/perfschema/r/connect_attrs.result
@@ -45,7 +45,7 @@ COUNT(DISTINCT PROCESSLIST_ID)
 1
 SELECT COUNT(DISTINCT PROCESSLIST_ID)
 FROM performance_schema.session_connect_attrs;
-ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table `performance_schema`.`session_connect_attrs`
 connection default;
 disconnect non_privileged_user;
 grant select on performance_schema.* to wl5924@localhost;
diff --git a/mysql-test/suite/perfschema/r/dml_accounts.result b/mysql-test/suite/perfschema/r/dml_accounts.result
index 7e04bb3ea08..dcbce511faf 100644
--- a/mysql-test/suite/perfschema/r/dml_accounts.result
+++ b/mysql-test/suite/perfschema/r/dml_accounts.result
@@ -5,23 +5,23 @@ where user='FOO' or host='BAR';
 insert into performance_schema.accounts
 set user='FOO', host='BAR',
 current_connections=1, total_connections=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
 update performance_schema.accounts
 set current_connections=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
 update performance_schema.accounts
 set current_connections=12 where host like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
 delete from performance_schema.accounts
 where total_connections=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
 delete from performance_schema.accounts;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
 LOCK TABLES performance_schema.accounts READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.accounts WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'accounts'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`accounts`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_cond_instances.result b/mysql-test/suite/perfschema/r/dml_cond_instances.result
index d9baa2a2c0f..2f35b1b391e 100644
--- a/mysql-test/suite/perfschema/r/dml_cond_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_cond_instances.result
@@ -3,20 +3,20 @@ select * from performance_schema.cond_instances
 where name='FOO';
 insert into performance_schema.cond_instances
 set name='FOO', object_instance_begin=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
 update performance_schema.cond_instances
 set name='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
 delete from performance_schema.cond_instances
 where name like "wait/%";
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
 delete from performance_schema.cond_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
 LOCK TABLES performance_schema.cond_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.cond_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'cond_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`cond_instances`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result
index 9081ee9dfdc..17c390fd203 100644
--- a/mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_stages_summary_by_account_by_event_name
 set event_name='FOO', user='BAR', host='BAZ',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
 update performance_schema.events_stages_summary_by_account_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
 update performance_schema.events_stages_summary_by_account_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
 delete from performance_schema.events_stages_summary_by_account_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
 delete from performance_schema.events_stages_summary_by_account_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
 LOCK TABLES performance_schema.events_stages_summary_by_account_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_stages_summary_by_account_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_account_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result
index a8c3584fa6e..2f3b59f138f 100644
--- a/mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_stages_summary_by_host_by_event_name
 set event_name='FOO', thread_id=1,
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
 update performance_schema.events_stages_summary_by_host_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
 update performance_schema.events_stages_summary_by_host_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
 delete from performance_schema.events_stages_summary_by_host_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
 delete from performance_schema.events_stages_summary_by_host_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
 LOCK TABLES performance_schema.events_stages_summary_by_host_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_stages_summary_by_host_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_host_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result
index 4e0fe6c8f24..77dd7b2e2b8 100644
--- a/mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_stages_summary_by_thread_by_event_name
 set event_name='FOO', thread_id=1,
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
 update performance_schema.events_stages_summary_by_thread_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
 update performance_schema.events_stages_summary_by_thread_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
 delete from performance_schema.events_stages_summary_by_thread_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
 delete from performance_schema.events_stages_summary_by_thread_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
 LOCK TABLES performance_schema.events_stages_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_stages_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_thread_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result
index bf492015fe4..77855e6b662 100644
--- a/mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_stages_summary_by_user_by_event_name
 set event_name='FOO', user='BAR',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
 update performance_schema.events_stages_summary_by_user_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
 update performance_schema.events_stages_summary_by_user_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
 delete from performance_schema.events_stages_summary_by_user_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
 delete from performance_schema.events_stages_summary_by_user_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
 LOCK TABLES performance_schema.events_stages_summary_by_user_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_stages_summary_by_user_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_by_user_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result
index 4fb98fdfdcc..f238c4cbd23 100644
--- a/mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result
@@ -5,23 +5,23 @@ where event_name='FOO';
 insert into performance_schema.events_stages_summary_global_by_event_name
 set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
 update performance_schema.events_stages_summary_global_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
 update performance_schema.events_stages_summary_global_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
 delete from performance_schema.events_stages_summary_global_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
 delete from performance_schema.events_stages_summary_global_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
 LOCK TABLES performance_schema.events_stages_summary_global_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_stages_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_summary_global_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result
index fdcf5f45c37..2d34f5ee320 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_statements_summary_by_account_by_event_nam
 set event_name='FOO', user='BAR', host='BAZ',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
 update performance_schema.events_statements_summary_by_account_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
 update performance_schema.events_statements_summary_by_account_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
 delete from performance_schema.events_statements_summary_by_account_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
 delete from performance_schema.events_statements_summary_by_account_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
 LOCK TABLES performance_schema.events_statements_summary_by_account_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_statements_summary_by_account_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_account_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_digest.result b/mysql-test/suite/perfschema/r/dml_esms_by_digest.result
index 0d43041b502..8240093de69 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_digest.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_digest.result
@@ -7,23 +7,23 @@ SCHEMA_NAME	DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIME
 insert into performance_schema.events_statements_summary_by_digest
 set digest='XXYYZZ', count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
 update performance_schema.events_statements_summary_by_digest
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
 update performance_schema.events_statements_summary_by_digest
 set count_star=12 where digest like "XXYYZZ";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
 delete from performance_schema.events_statements_summary_by_digest
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
 delete from performance_schema.events_statements_summary_by_digest;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
 LOCK TABLES performance_schema.events_statements_summary_by_digest READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_statements_summary_by_digest WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_digest'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_digest`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result
index 3d38c94ac52..847caf205ec 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_statements_summary_by_host_by_event_name
 set event_name='FOO', thread_id=1,
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
 update performance_schema.events_statements_summary_by_host_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
 update performance_schema.events_statements_summary_by_host_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
 delete from performance_schema.events_statements_summary_by_host_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
 delete from performance_schema.events_statements_summary_by_host_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
 LOCK TABLES performance_schema.events_statements_summary_by_host_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_statements_summary_by_host_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_host_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_program.result b/mysql-test/suite/perfschema/r/dml_esms_by_program.result
index b8c86fe3e45..b507652ea89 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_program.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_program.result
@@ -7,21 +7,21 @@ OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	A
 insert into performance_schema.events_statements_summary_by_program
 set object_name='XXYYZZ', count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
 update performance_schema.events_statements_summary_by_program
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
 update performance_schema.events_statements_summary_by_program
 set count_star=12 where object_name like "XXYYZZ";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
 delete from performance_schema.events_statements_summary_by_program
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
 delete from performance_schema.events_statements_summary_by_program;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
 LOCK TABLES performance_schema.events_statements_summary_by_program READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_statements_summary_by_program WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_program`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result
index ef464440ebf..d8dfb72f78f 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_statements_summary_by_thread_by_event_name
 set event_name='FOO', thread_id=1,
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
 update performance_schema.events_statements_summary_by_thread_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
 update performance_schema.events_statements_summary_by_thread_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
 delete from performance_schema.events_statements_summary_by_thread_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
 delete from performance_schema.events_statements_summary_by_thread_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
 LOCK TABLES performance_schema.events_statements_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_statements_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_thread_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result
index e92d87b45ad..12290453a04 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_statements_summary_by_user_by_event_name
 set event_name='FOO', user='BAR',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
 update performance_schema.events_statements_summary_by_user_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
 update performance_schema.events_statements_summary_by_user_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
 delete from performance_schema.events_statements_summary_by_user_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
 delete from performance_schema.events_statements_summary_by_user_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
 LOCK TABLES performance_schema.events_statements_summary_by_user_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_statements_summary_by_user_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_by_user_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result
index 14c1026fedd..a12b308b24c 100644
--- a/mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result
@@ -5,23 +5,23 @@ where event_name='FOO';
 insert into performance_schema.events_statements_summary_global_by_event_name
 set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
 update performance_schema.events_statements_summary_global_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
 update performance_schema.events_statements_summary_global_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
 delete from performance_schema.events_statements_summary_global_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
 delete from performance_schema.events_statements_summary_global_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
 LOCK TABLES performance_schema.events_statements_summary_global_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_statements_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_summary_global_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result
index 66a0f733d19..01d87f5275b 100644
--- a/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result
@@ -6,21 +6,21 @@ insert into performance_schema.events_transactions_summary_by_account_by_event_n
 set event_name='FOO', user='BAR', host='BAZ',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
 update performance_schema.events_transactions_summary_by_account_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
 update performance_schema.events_transactions_summary_by_account_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
 delete from performance_schema.events_transactions_summary_by_account_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
 delete from performance_schema.events_transactions_summary_by_account_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
 LOCK TABLES performance_schema.events_transactions_summary_by_account_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_transactions_summary_by_account_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_account_by_event_name`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result
index 194d8ff0b4b..4d138f9789c 100644
--- a/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result
@@ -6,21 +6,21 @@ insert into performance_schema.events_transactions_summary_by_host_by_event_name
 set event_name='FOO', thread_id=1,
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
 update performance_schema.events_transactions_summary_by_host_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
 update performance_schema.events_transactions_summary_by_host_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
 delete from performance_schema.events_transactions_summary_by_host_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
 delete from performance_schema.events_transactions_summary_by_host_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
 LOCK TABLES performance_schema.events_transactions_summary_by_host_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_transactions_summary_by_host_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_host_by_event_name`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result
index f096d265457..75a023a2326 100644
--- a/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result
@@ -6,21 +6,21 @@ insert into performance_schema.events_transactions_summary_by_thread_by_event_na
 set event_name='FOO', thread_id=1,
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
 update performance_schema.events_transactions_summary_by_thread_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
 update performance_schema.events_transactions_summary_by_thread_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
 delete from performance_schema.events_transactions_summary_by_thread_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
 delete from performance_schema.events_transactions_summary_by_thread_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
 LOCK TABLES performance_schema.events_transactions_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_transactions_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_thread_by_event_name`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result
index 11d455a35a7..0e8efe2d817 100644
--- a/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result
@@ -6,21 +6,21 @@ insert into performance_schema.events_transactions_summary_by_user_by_event_name
 set event_name='FOO', user='BAR',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
 update performance_schema.events_transactions_summary_by_user_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
 update performance_schema.events_transactions_summary_by_user_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
 delete from performance_schema.events_transactions_summary_by_user_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
 delete from performance_schema.events_transactions_summary_by_user_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
 LOCK TABLES performance_schema.events_transactions_summary_by_user_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_transactions_summary_by_user_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_by_user_by_event_name`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result
index 0f2bd599af8..e1158839d18 100644
--- a/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result
@@ -5,21 +5,21 @@ where event_name='FOO';
 insert into performance_schema.events_transactions_summary_global_by_event_name
 set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
 update performance_schema.events_transactions_summary_global_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
 update performance_schema.events_transactions_summary_global_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
 delete from performance_schema.events_transactions_summary_global_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
 delete from performance_schema.events_transactions_summary_global_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
 LOCK TABLES performance_schema.events_transactions_summary_global_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_transactions_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_summary_global_by_event_name`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_stages_current.result b/mysql-test/suite/perfschema/r/dml_events_stages_current.result
index 05a0885f08f..7a27bfbf3d0 100644
--- a/mysql-test/suite/perfschema/r/dml_events_stages_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_stages_current.result
@@ -5,23 +5,23 @@ where event_name='FOO';
 insert into performance_schema.events_stages_current
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
 update performance_schema.events_stages_current
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
 update performance_schema.events_stages_current
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
 delete from performance_schema.events_stages_current
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
 delete from performance_schema.events_stages_current;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
 LOCK TABLES performance_schema.events_stages_current READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_stages_current WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_current`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_stages_history.result b/mysql-test/suite/perfschema/r/dml_events_stages_history.result
index d353d8a6a7f..469ea78a867 100644
--- a/mysql-test/suite/perfschema/r/dml_events_stages_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_stages_history.result
@@ -9,23 +9,23 @@ where event_name like 'stage/%' order by timer_wait desc limit 1;
 insert into performance_schema.events_stages_history
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
 update performance_schema.events_stages_history
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
 update performance_schema.events_stages_history
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
 delete from performance_schema.events_stages_history
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
 delete from performance_schema.events_stages_history;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
 LOCK TABLES performance_schema.events_stages_history READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_stages_history WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result b/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result
index 81fb070aea5..d89b1a81519 100644
--- a/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result
@@ -9,23 +9,23 @@ where event_name like 'stage/%' order by timer_wait desc limit 1;
 insert into performance_schema.events_stages_history_long
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
 update performance_schema.events_stages_history_long
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
 update performance_schema.events_stages_history_long
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
 delete from performance_schema.events_stages_history_long
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
 delete from performance_schema.events_stages_history_long;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
 LOCK TABLES performance_schema.events_stages_history_long READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_stages_history_long WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_stages_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_stages_history_long`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_statements_current.result b/mysql-test/suite/perfschema/r/dml_events_statements_current.result
index b9d6fce6dae..3a57d318e61 100644
--- a/mysql-test/suite/perfschema/r/dml_events_statements_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_statements_current.result
@@ -5,23 +5,23 @@ where event_name='FOO';
 insert into performance_schema.events_statements_current
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
 update performance_schema.events_statements_current
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
 update performance_schema.events_statements_current
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
 delete from performance_schema.events_statements_current
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
 delete from performance_schema.events_statements_current;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
 LOCK TABLES performance_schema.events_statements_current READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_statements_current WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_current`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_statements_history.result b/mysql-test/suite/perfschema/r/dml_events_statements_history.result
index e529c1264de..88a3f7df7e2 100644
--- a/mysql-test/suite/perfschema/r/dml_events_statements_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_statements_history.result
@@ -9,23 +9,23 @@ where event_name like 'statement/%' order by timer_wait desc limit 1;
 insert into performance_schema.events_statements_history
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
 update performance_schema.events_statements_history
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
 update performance_schema.events_statements_history
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
 delete from performance_schema.events_statements_history
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
 delete from performance_schema.events_statements_history;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
 LOCK TABLES performance_schema.events_statements_history READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_statements_history WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result b/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result
index dde16516d84..36b00606ac5 100644
--- a/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result
@@ -9,23 +9,23 @@ where event_name like 'statement/%' order by timer_wait desc limit 1;
 insert into performance_schema.events_statements_history_long
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
 update performance_schema.events_statements_history_long
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
 update performance_schema.events_statements_history_long
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
 delete from performance_schema.events_statements_history_long
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
 delete from performance_schema.events_statements_history_long;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
 LOCK TABLES performance_schema.events_statements_history_long READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_statements_history_long WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_statements_history_long`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_transactions_current.result b/mysql-test/suite/perfschema/r/dml_events_transactions_current.result
index 9a6c4f3bd58..d34b229112c 100644
--- a/mysql-test/suite/perfschema/r/dml_events_transactions_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_transactions_current.result
@@ -5,21 +5,21 @@ where event_name='FOO';
 insert into performance_schema.events_transactions_current
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
 update performance_schema.events_transactions_current
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
 update performance_schema.events_transactions_current
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
 delete from performance_schema.events_transactions_current
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
 delete from performance_schema.events_transactions_current;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
 LOCK TABLES performance_schema.events_transactions_current READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_transactions_current WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_current`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_transactions_history.result b/mysql-test/suite/perfschema/r/dml_events_transactions_history.result
index 000e6a26753..875f49e73af 100644
--- a/mysql-test/suite/perfschema/r/dml_events_transactions_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_transactions_history.result
@@ -9,21 +9,21 @@ where event_name in ('transaction') order by timer_wait desc limit 1;
 insert into performance_schema.events_transactions_history
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
 update performance_schema.events_transactions_history
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
 update performance_schema.events_transactions_history
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
 delete from performance_schema.events_transactions_history
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
 delete from performance_schema.events_transactions_history;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
 LOCK TABLES performance_schema.events_transactions_history READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_transactions_history WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result b/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result
index e954bcd1be1..6f11d9a4c21 100644
--- a/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result
@@ -9,21 +9,21 @@ where event_name in ('transaction') order by timer_wait desc limit 1;
 insert into performance_schema.events_transactions_history_long
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
 update performance_schema.events_transactions_history_long
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
 update performance_schema.events_transactions_history_long
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
 delete from performance_schema.events_transactions_history_long
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
 delete from performance_schema.events_transactions_history_long;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
 LOCK TABLES performance_schema.events_transactions_history_long READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_transactions_history_long WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_transactions_history_long`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_current.result b/mysql-test/suite/perfschema/r/dml_events_waits_current.result
index 0d9b343a852..cb84d5e319c 100644
--- a/mysql-test/suite/perfschema/r/dml_events_waits_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_current.result
@@ -5,23 +5,23 @@ where event_name='FOO';
 insert into performance_schema.events_waits_current
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 update performance_schema.events_waits_current
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 update performance_schema.events_waits_current
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 delete from performance_schema.events_waits_current
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 delete from performance_schema.events_waits_current;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 LOCK TABLES performance_schema.events_waits_current READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_current WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_history.result b/mysql-test/suite/perfschema/r/dml_events_waits_history.result
index 96d2b4b680e..bdc853ef0e2 100644
--- a/mysql-test/suite/perfschema/r/dml_events_waits_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_history.result
@@ -9,23 +9,23 @@ where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1;
 insert into performance_schema.events_waits_history
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
 update performance_schema.events_waits_history
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
 update performance_schema.events_waits_history
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
 delete from performance_schema.events_waits_history
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
 delete from performance_schema.events_waits_history;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
 LOCK TABLES performance_schema.events_waits_history READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_history WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result b/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
index 99af65297ef..b7f4e356afd 100644
--- a/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
@@ -9,23 +9,23 @@ where event_name like 'Wait/Synch/%' order by timer_wait desc limit 1;
 insert into performance_schema.events_waits_history_long
 set thread_id='1', event_id=1,
 event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
 update performance_schema.events_waits_history_long
 set timer_start=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
 update performance_schema.events_waits_history_long
 set timer_start=12 where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
 delete from performance_schema.events_waits_history_long
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
 delete from performance_schema.events_waits_history_long;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
 LOCK TABLES performance_schema.events_waits_history_long READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_history_long WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_history_long`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result
index bfe9e29446b..c9b89209c3b 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result
@@ -9,23 +9,23 @@ insert into performance_schema.events_waits_summary_by_account_by_event_name
 set event_name='FOO', user='BAR', host='BAZ',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
 update performance_schema.events_waits_summary_by_account_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
 update performance_schema.events_waits_summary_by_account_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
 delete from performance_schema.events_waits_summary_by_account_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
 delete from performance_schema.events_waits_summary_by_account_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
 LOCK TABLES performance_schema.events_waits_summary_by_account_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_summary_by_account_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_account_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result
index dc717e8b7c5..19ea3ae1f7e 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result
@@ -9,23 +9,23 @@ insert into performance_schema.events_waits_summary_by_host_by_event_name
 set event_name='FOO', thread_id=1,
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
 update performance_schema.events_waits_summary_by_host_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
 update performance_schema.events_waits_summary_by_host_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
 delete from performance_schema.events_waits_summary_by_host_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
 delete from performance_schema.events_waits_summary_by_host_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
 LOCK TABLES performance_schema.events_waits_summary_by_host_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_summary_by_host_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_host_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result
index a9686526a77..f203178eb75 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_instance.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_instance.result
@@ -14,23 +14,23 @@ insert into performance_schema.events_waits_summary_by_instance
 set event_name='FOO', object_instance_begin=0,
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
 update performance_schema.events_waits_summary_by_instance
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
 update performance_schema.events_waits_summary_by_instance
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
 delete from performance_schema.events_waits_summary_by_instance
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
 delete from performance_schema.events_waits_summary_by_instance;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
 LOCK TABLES performance_schema.events_waits_summary_by_instance READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_summary_by_instance WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
index e974523df7c..5848905248e 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.events_waits_summary_by_thread_by_event_name
 set event_name='FOO', thread_id=1,
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
 update performance_schema.events_waits_summary_by_thread_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
 update performance_schema.events_waits_summary_by_thread_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
 delete from performance_schema.events_waits_summary_by_thread_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
 delete from performance_schema.events_waits_summary_by_thread_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
 LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_thread_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result
index 6cfc44961b9..e48492b39c6 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result
@@ -9,23 +9,23 @@ insert into performance_schema.events_waits_summary_by_user_by_event_name
 set event_name='FOO', user='BAR',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
 update performance_schema.events_waits_summary_by_user_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
 update performance_schema.events_waits_summary_by_user_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
 delete from performance_schema.events_waits_summary_by_user_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
 delete from performance_schema.events_waits_summary_by_user_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
 LOCK TABLES performance_schema.events_waits_summary_by_user_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_summary_by_user_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_by_user_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
index 37a5a22795c..eecb441f704 100644
--- a/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
@@ -5,23 +5,23 @@ where event_name='FOO';
 insert into performance_schema.events_waits_summary_global_by_event_name
 set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
 update performance_schema.events_waits_summary_global_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
 update performance_schema.events_waits_summary_global_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
 delete from performance_schema.events_waits_summary_global_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
 delete from performance_schema.events_waits_summary_global_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
 LOCK TABLES performance_schema.events_waits_summary_global_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.events_waits_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_summary_global_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_file_instances.result b/mysql-test/suite/perfschema/r/dml_file_instances.result
index 7d25481662c..75c6ad8525d 100644
--- a/mysql-test/suite/perfschema/r/dml_file_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_file_instances.result
@@ -3,20 +3,20 @@ select * from performance_schema.file_instances
 where file_name='FOO';
 insert into performance_schema.file_instances
 set file_name='FOO', event_name='BAR', open_count=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 update performance_schema.file_instances
 set file_name='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 delete from performance_schema.file_instances
 where event_name like "wait/%";
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 delete from performance_schema.file_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 LOCK TABLES performance_schema.file_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.file_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_fs_by_event_name.result b/mysql-test/suite/perfschema/r/dml_fs_by_event_name.result
index 15dededb288..4ab3e6428bd 100644
--- a/mysql-test/suite/perfschema/r/dml_fs_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_fs_by_event_name.result
@@ -5,23 +5,23 @@ where event_name='FOO';
 insert into performance_schema.file_summary_by_event_name
 set event_name='FOO', count_read=1, count_write=2,
 sum_number_of_bytes_read=4, sum_number_of_bytes_write=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
 update performance_schema.file_summary_by_event_name
 set count_read=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
 update performance_schema.file_summary_by_event_name
 set count_write=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
 delete from performance_schema.file_summary_by_event_name
 where count_read=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
 delete from performance_schema.file_summary_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
 LOCK TABLES performance_schema.file_summary_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.file_summary_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_fs_by_instance.result b/mysql-test/suite/perfschema/r/dml_fs_by_instance.result
index 39e871b0e50..0c0d5a6c724 100644
--- a/mysql-test/suite/perfschema/r/dml_fs_by_instance.result
+++ b/mysql-test/suite/perfschema/r/dml_fs_by_instance.result
@@ -5,23 +5,23 @@ where event_name='FOO';
 insert into performance_schema.file_summary_by_instance
 set event_name='FOO', count_read=1, count_write=2,
 sum_number_of_bytes_read=4, sum_number_of_bytes_write=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
 update performance_schema.file_summary_by_instance
 set count_read=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
 update performance_schema.file_summary_by_instance
 set count_write=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
 delete from performance_schema.file_summary_by_instance
 where count_read=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
 delete from performance_schema.file_summary_by_instance;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
 LOCK TABLES performance_schema.file_summary_by_instance READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.file_summary_by_instance WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_summary_by_instance`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_global_status.result b/mysql-test/suite/perfschema/r/dml_global_status.result
index 90b7ac8147f..27dd5859240 100644
--- a/mysql-test/suite/perfschema/r/dml_global_status.result
+++ b/mysql-test/suite/perfschema/r/dml_global_status.result
@@ -4,18 +4,18 @@ select * from performance_schema.global_status
 where variable_name='FOO';
 insert into performance_schema.global_status
 set variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
 update performance_schema.global_status
 set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
 delete from performance_schema.global_status
 where variable_name <> 'FOO';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
 delete from performance_schema.global_status;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
 LOCK TABLES performance_schema.global_status READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.global_status WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'global_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`global_status`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_host_cache.result b/mysql-test/suite/perfschema/r/dml_host_cache.result
index 1165be23804..f9291e053bb 100644
--- a/mysql-test/suite/perfschema/r/dml_host_cache.result
+++ b/mysql-test/suite/perfschema/r/dml_host_cache.result
@@ -4,26 +4,26 @@ select * from performance_schema.host_cache
 where IP='localhost';
 insert into performance_schema.host_cache
 set IP='FOO', SUM_BLOCKING_ERRORS=1, COUNT_FCRDNS_ERRORS=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
 update performance_schema.host_cache
 set COUNT_UNKNOWN_ERRORS=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
 update performance_schema.host_cache
 set SUM_BLOCKING_ERRORS=12 where IP='127.0.0.1';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
 select HOST from performance_schema.host_cache
 where IP='::1';
 HOST
 delete from performance_schema.host_cache
 where IP='::1';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
 delete from performance_schema.host_cache;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
 LOCK TABLES performance_schema.host_cache READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.host_cache WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'host_cache'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`host_cache`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_hosts.result b/mysql-test/suite/perfschema/r/dml_hosts.result
index e282110bf77..af661363f2d 100644
--- a/mysql-test/suite/perfschema/r/dml_hosts.result
+++ b/mysql-test/suite/perfschema/r/dml_hosts.result
@@ -5,23 +5,23 @@ where host='FOO';
 insert into performance_schema.hosts
 set host='FOO',
 current_connections=1, total_connections=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
 update performance_schema.hosts
 set current_connections=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
 update performance_schema.hosts
 set current_connections=12 where host like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
 delete from performance_schema.hosts
 where total_connections=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
 delete from performance_schema.hosts;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
 LOCK TABLES performance_schema.hosts READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.hosts WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'hosts'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`hosts`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result
index 2532debd1ad..b8f22f8c3a3 100644
--- a/mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.memory_summary_by_account_by_event_name
 set event_name='FOO', user='BAR', host='BAZ',
 count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
 sum_number_of_bytes_free=4, low_count_used=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
 update performance_schema.memory_summary_by_account_by_event_name
 set count_alloc=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
 update performance_schema.memory_summary_by_account_by_event_name
 set count_alloc=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
 delete from performance_schema.memory_summary_by_account_by_event_name
 where count_alloc=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
 delete from performance_schema.memory_summary_by_account_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
 LOCK TABLES performance_schema.memory_summary_by_account_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.memory_summary_by_account_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_account_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result
index 6e78102ba91..405317e948f 100644
--- a/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.memory_summary_by_host_by_event_name
 set event_name='FOO', host='BAZ',
 count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
 sum_number_of_bytes_free=4, low_count_used=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
 update performance_schema.memory_summary_by_host_by_event_name
 set count_alloc=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
 update performance_schema.memory_summary_by_host_by_event_name
 set count_alloc=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
 delete from performance_schema.memory_summary_by_host_by_event_name
 where count_alloc=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
 delete from performance_schema.memory_summary_by_host_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
 LOCK TABLES performance_schema.memory_summary_by_host_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.memory_summary_by_host_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_host_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result
index f1576b22896..3f9e15676f5 100644
--- a/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result
@@ -6,21 +6,21 @@ insert into performance_schema.memory_summary_by_thread_by_event_name
 set event_name='FOO', thread_id=12,
 count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
 sum_number_of_bytes_free=4, low_count_used=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
 update performance_schema.memory_summary_by_thread_by_event_name
 set count_alloc=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
 update performance_schema.memory_summary_by_thread_by_event_name
 set count_alloc=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
 delete from performance_schema.memory_summary_by_thread_by_event_name
 where count_alloc=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
 delete from performance_schema.memory_summary_by_thread_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
 LOCK TABLES performance_schema.memory_summary_by_thread_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.memory_summary_by_thread_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_thread_by_event_name`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result
index 3e81a141e32..6250fde2d10 100644
--- a/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.memory_summary_by_user_by_event_name
 set event_name='FOO', user='BAR',
 count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
 sum_number_of_bytes_free=4, low_count_used=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
 update performance_schema.memory_summary_by_user_by_event_name
 set count_alloc=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
 update performance_schema.memory_summary_by_user_by_event_name
 set count_alloc=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
 delete from performance_schema.memory_summary_by_user_by_event_name
 where count_alloc=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
 delete from performance_schema.memory_summary_by_user_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
 LOCK TABLES performance_schema.memory_summary_by_user_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.memory_summary_by_user_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_by_user_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result
index cd9eafd0a1e..cb0aaee6e52 100644
--- a/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.memory_summary_global_by_event_name
 set event_name='FOO',
 count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
 sum_number_of_bytes_free=4, low_count_used=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
 update performance_schema.memory_summary_global_by_event_name
 set count_alloc=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
 update performance_schema.memory_summary_global_by_event_name
 set count_alloc=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
 delete from performance_schema.memory_summary_global_by_event_name
 where count_alloc=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
 delete from performance_schema.memory_summary_global_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
 LOCK TABLES performance_schema.memory_summary_global_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.memory_summary_global_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`memory_summary_global_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_metadata_locks.result b/mysql-test/suite/perfschema/r/dml_metadata_locks.result
index 3ec90064737..cf87b6efdb7 100644
--- a/mysql-test/suite/perfschema/r/dml_metadata_locks.result
+++ b/mysql-test/suite/perfschema/r/dml_metadata_locks.result
@@ -4,20 +4,20 @@ where object_name='foo';
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	LOCK_TYPE	LOCK_DURATION	LOCK_STATUS	SOURCE	OWNER_THREAD_ID	OWNER_EVENT_ID
 insert into performance_schema.metadata_locks
 set object_name='FOO', owner_thread_id=1;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
 update performance_schema.metadata_locks
 set owner_thread_id=12 where object_name='foo';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
 delete from performance_schema.metadata_locks;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
 delete from performance_schema.metadata_locks
 where timer_name='CYCLE';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
 LOCK TABLES performance_schema.metadata_locks READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.metadata_locks WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'metadata_locks'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`metadata_locks`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_mutex_instances.result b/mysql-test/suite/perfschema/r/dml_mutex_instances.result
index 2f222118001..c2de16c87bb 100644
--- a/mysql-test/suite/perfschema/r/dml_mutex_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_mutex_instances.result
@@ -3,20 +3,20 @@ select * from performance_schema.mutex_instances
 where name='FOO';
 insert into performance_schema.mutex_instances
 set name='FOO', object_instance_begin=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
 update performance_schema.mutex_instances
 set name='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
 delete from performance_schema.mutex_instances
 where name like "wait/%";
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
 delete from performance_schema.mutex_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
 LOCK TABLES performance_schema.mutex_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.mutex_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'mutex_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`mutex_instances`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_os_global_by_type.result b/mysql-test/suite/perfschema/r/dml_os_global_by_type.result
index 72ba764e7c3..eb8eeda6384 100644
--- a/mysql-test/suite/perfschema/r/dml_os_global_by_type.result
+++ b/mysql-test/suite/perfschema/r/dml_os_global_by_type.result
@@ -25,23 +25,23 @@ insert into performance_schema.objects_summary_global_by_type
 set object_type='TABLE', schema_name='FOO', object_name='BAR',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
 update performance_schema.objects_summary_global_by_type
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
 update performance_schema.objects_summary_global_by_type
 set count_star=12 where object_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
 delete from performance_schema.objects_summary_global_by_type
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
 delete from performance_schema.objects_summary_global_by_type;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
 LOCK TABLES performance_schema.objects_summary_global_by_type READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.objects_summary_global_by_type WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'objects_summary_global_by_type'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`objects_summary_global_by_type`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_performance_timers.result b/mysql-test/suite/perfschema/r/dml_performance_timers.result
index b1d4406137c..c99784742f4 100644
--- a/mysql-test/suite/perfschema/r/dml_performance_timers.result
+++ b/mysql-test/suite/perfschema/r/dml_performance_timers.result
@@ -12,20 +12,20 @@ CYCLE	<frequency>	<resolution>	<overhead>
 insert into performance_schema.performance_timers
 set timer_name='FOO', timer_frequency=1,
 timer_resolution=2, timer_overhead=3;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
 update performance_schema.performance_timers
 set timer_frequency=12 where timer_name='CYCLE';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
 delete from performance_schema.performance_timers;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
 delete from performance_schema.performance_timers
 where timer_name='CYCLE';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
 LOCK TABLES performance_schema.performance_timers READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.performance_timers WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'performance_timers'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`performance_timers`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result b/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result
index dbccb963a61..92be22051b0 100644
--- a/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result
@@ -7,20 +7,20 @@ OBJECT_INSTANCE_BEGIN	STATEMENT_ID	STATEMENT_NAME	SQL_TEXT	OWNER_THREAD_ID	OWNER
 insert into performance_schema.prepared_statements_instances
 set owner_object_name='XXYYZZ', count_execute=1, sum_timer_execute=2,
 min_timer_execute=3, avg_timer_execute=4, max_timer_execute=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
 update performance_schema.prepared_statements_instances set count_execute=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
 update performance_schema.prepared_statements_instances
 set count_execute=12 where owner_object_name like "XXYYZZ";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
 delete from performance_schema.prepared_statements_instances
 where count_execute=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
 delete from performance_schema.prepared_statements_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
 LOCK TABLES performance_schema.prepared_statements_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.prepared_statements_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`prepared_statements_instances`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result b/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result
index 0e5711b5732..eee36e49fbf 100644
--- a/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result
@@ -4,18 +4,18 @@ sELECT * FROM performance_schema.replication_applier_configuration
 WHERE desired_delay=12;
 INSERT INTO performance_schema.replication_applier_configuration
 SET desired_delay=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
 UPDATE performance_schema.replication_applier_configuration
 SET desired_delay=12 WHERE desired_delay=2;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
 DELETE FROM performance_schema.replication_applier_configuration
 WHERE desired_delay=12;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
 DELETE FROM performance_schema.replication_applier_configuration;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
 LOCK TABLES performance_schema.replication_applier_configuration READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.replication_applier_configuration WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_configuration`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_status.result b/mysql-test/suite/perfschema/r/dml_replication_applier_status.result
index e6464c58e85..11f5d80fce7 100644
--- a/mysql-test/suite/perfschema/r/dml_replication_applier_status.result
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_status.result
@@ -4,21 +4,21 @@ SELECT * FROM performance_schema.replication_applier_status
 WHERE service_state='YES' OR remaining_delay=12;
 INSERT INTO performance_schema.replication_applier_status
 SET service_state='YES', remaining_delay=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
 UPDATE performance_schema.replication_applier_status
 SET remaining_delay=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
 UPDATE performance_schema.replication_applier_status
 SET remaining_delay=12 WHERE service_state='YES';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
 DELETE FROM performance_schema.replication_applier_status
 WHERE service_state='YES';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
 DELETE FROM performance_schema.replication_applier_status;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
 LOCK TABLES performance_schema.replication_applier_status READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.replication_applier_status WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result
index d6818fd1280..19dae11a8c9 100644
--- a/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result
@@ -5,21 +5,21 @@ WHERE service_state='YES' or last_error_message='ERROR';
 INSERT INTO performance_schema.replication_applier_status_by_coordinator
 SET service_state='YES', last_error_message='ERROR', thread_id=2,
 last_error_number=1234;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
 UPDATE performance_schema.replication_applier_status_by_coordinator
 SET last_error_number=1234;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
 UPDATE performance_schema.replication_applier_status_by_coordinator
 SET last_error_number=1234 where service_state like "YES";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
 DELETE FROM performance_schema.replication_applier_status_by_coordinator
 WHERE thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
 DELETE FROM performance_schema.replication_applier_status_by_coordinator;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
 LOCK TABLES performance_schema.replication_applier_status_by_coordinator READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.replication_applier_status_by_coordinator WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_coordinator`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result
index 2a1552c8453..e61e5a2d0b4 100644
--- a/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result
@@ -5,23 +5,23 @@ WHERE service_state='YES' OR last_error_message='ERROR';
 INSERT INTO performance_schema.replication_applier_status_by_worker
 SET service_state='YES', last_error_message='ERROR',
 worker_id=1, thread_id=2, last_error_number=1234;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
 UPDATE performance_schema.replication_applier_status_by_worker
 SET worker_id=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
 UPDATE performance_schema.replication_applier_status_by_worker
 SET worker_d=12 where service_state like "YES";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
 DELETE FROM performance_schema.replication_applier_status_by_worker
 WHERE worker_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
 DELETE FROM performance_schema.replication_applier_status_by_worker;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
 LOCK TABLES performance_schema.replication_applier_status_by_worker READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.replication_applier_status_by_worker WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_applier_status_by_worker`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result b/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result
index d338d4ab38a..a57b6901095 100644
--- a/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result
+++ b/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result
@@ -5,21 +5,21 @@ WHERE user='FOO' or host='BAR';
 INSERT INTO performance_schema.replication_connection_configuration
 SET user='FOO', host='BAR',
 port=1, connection_retry_count=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
 UPDATE performance_schema.replication_connection_configuration
 SET connection_retry_interval=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
 UPDATE performance_schema.replication_connection_configuration
 SET connection_retry_interval=12 WHERE host LIKE "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
 DELETE FROM performance_schema.replication_connection_configuration
 WHERE connection_retry_count=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
 DELETE FROM performance_schema.replication_connection_configuration;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
 LOCK TABLES performance_schema.replication_connection_configuration READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.replication_connection_configuration WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`replication_connection_configuration`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result
index 4ffe125dfd7..0c1c211e5b7 100644
--- a/mysql-test/suite/perfschema/r/dml_rwlock_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_rwlock_instances.result
@@ -3,20 +3,20 @@ select * from performance_schema.rwlock_instances
 where name='FOO';
 insert into performance_schema.rwlock_instances
 set name='FOO', object_instance_begin=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
 update performance_schema.rwlock_instances
 set name='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
 delete from performance_schema.rwlock_instances
 where name like "wait/%";
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
 delete from performance_schema.rwlock_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
 LOCK TABLES performance_schema.rwlock_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.rwlock_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'rwlock_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`rwlock_instances`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result b/mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result
index e79deb172b3..ca9ad32d9bb 100644
--- a/mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result
+++ b/mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result
@@ -5,23 +5,23 @@ where ATTR_NAME='FOO' OR ATTR_VALUE='BAR';
 INSERT INTO performance_schema.session_account_connect_attrs
 SET ATTR_NAME='FOO', ATTR_VALUE='BAR',
 ORDINAL_POSITION=100, PROCESS_ID=102;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
 UPDATE performance_schema.session_account_connect_attrs
 SET ATTR_NAME='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
 UPDATE performance_schema.session_account_connect_attrs
 SET ATTR_NAME='FOO' WHERE ATTR_VALUE='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
 DELETE FROM performance_schema.session_account_connect_attrs
 WHERE ATTR_VALUE='BAR';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
 DELETE FROM performance_schema.session_account_connect_attrs;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
 LOCK TABLES performance_schema.session_account_connect_attrs READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.session_account_connect_attrs WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_session_connect_attrs.result b/mysql-test/suite/perfschema/r/dml_session_connect_attrs.result
index c56af4a448d..e6b76c386f4 100644
--- a/mysql-test/suite/perfschema/r/dml_session_connect_attrs.result
+++ b/mysql-test/suite/perfschema/r/dml_session_connect_attrs.result
@@ -5,23 +5,23 @@ where ATTR_NAME='FOO' OR ATTR_VALUE='BAR';
 INSERT INTO performance_schema.session_connect_attrs
 SET ATTR_NAME='FOO', ATTR_VALUE='BAR',
 ORDINAL_POSITION=100, PROCESS_ID=102;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
 UPDATE performance_schema.session_connect_attrs
 SET ATTR_NAME='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
 UPDATE performance_schema.session_connect_attrs
 SET ATTR_NAME='FOO' WHERE ATTR_VALUE='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
 DELETE FROM performance_schema.session_connect_attrs
 WHERE ATTR_VALUE='BAR';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
 DELETE FROM performance_schema.session_connect_attrs;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
 LOCK TABLES performance_schema.session_connect_attrs READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.session_connect_attrs WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_connect_attrs'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_connect_attrs`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_session_status.result b/mysql-test/suite/perfschema/r/dml_session_status.result
index 979d97daa83..4f36d9e8b6f 100644
--- a/mysql-test/suite/perfschema/r/dml_session_status.result
+++ b/mysql-test/suite/perfschema/r/dml_session_status.result
@@ -4,18 +4,18 @@ select * from performance_schema.session_status
 where variable_name='FOO';
 insert into performance_schema.session_status
 set variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
 update performance_schema.session_status
 set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
 delete from performance_schema.session_status
 where variable_name <> 'FOO';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
 delete from performance_schema.session_status;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
 LOCK TABLES performance_schema.session_status READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.session_status WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_status'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`session_status`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_consumers.result b/mysql-test/suite/perfschema/r/dml_setup_consumers.result
index d5db0fb7a88..a72b238f9ad 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_consumers.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_consumers.result
@@ -42,17 +42,17 @@ where enabled='NO';
 NAME	ENABLED
 insert into performance_schema.setup_consumers
 set name='FOO', enabled='YES';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_consumers'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_consumers`
 update performance_schema.setup_consumers
 set name='FOO';
 ERROR HY000: Invalid performance_schema usage
 update performance_schema.setup_consumers
 set enabled='YES';
 delete from performance_schema.setup_consumers;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_consumers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_consumers`
 delete from performance_schema.setup_consumers
 where name='events_waits_current';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_consumers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_consumers`
 LOCK TABLES performance_schema.setup_consumers READ;
 UNLOCK TABLES;
 LOCK TABLES performance_schema.setup_consumers WRITE;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
index e87faf723f0..cdc52da54dc 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
@@ -57,7 +57,7 @@ select * from performance_schema.setup_instruments
 where enabled='YES';
 insert into performance_schema.setup_instruments
 set name='FOO', enabled='YES', timed='YES';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
 update performance_schema.setup_instruments
 set name='FOO';
 ERROR HY000: Invalid performance_schema usage
@@ -69,10 +69,10 @@ select * from performance_schema.setup_instruments;
 update performance_schema.setup_instruments
 set enabled='YES', timed='YES';
 delete from performance_schema.setup_instruments;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
 delete from performance_schema.setup_instruments
 where name like 'Wait/Synch/%';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
 LOCK TABLES performance_schema.setup_instruments READ;
 UNLOCK TABLES;
 LOCK TABLES performance_schema.setup_instruments WRITE;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_timers.result b/mysql-test/suite/perfschema/r/dml_setup_timers.result
index 9783425a642..6f5a1f5cb4b 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_timers.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_timers.result
@@ -41,7 +41,7 @@ Warnings:
 Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 insert into performance_schema.setup_timers
 set name='FOO', timer_name='CYCLE';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_timers'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_timers`
 update performance_schema.setup_timers
 set name='FOO';
 ERROR HY000: Invalid performance_schema usage
@@ -63,10 +63,10 @@ set timer_name='CYCLE';
 Warnings:
 Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
 delete from performance_schema.setup_timers;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_timers`
 delete from performance_schema.setup_timers
 where name='Wait';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_timers`
 LOCK TABLES performance_schema.setup_timers READ;
 UNLOCK TABLES;
 LOCK TABLES performance_schema.setup_timers WRITE;
diff --git a/mysql-test/suite/perfschema/r/dml_socket_instances.result b/mysql-test/suite/perfschema/r/dml_socket_instances.result
index d54e956e51b..571d4ad5552 100644
--- a/mysql-test/suite/perfschema/r/dml_socket_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_socket_instances.result
@@ -3,20 +3,20 @@ select * from performance_schema.socket_instances
 where ip='FOO';
 insert into performance_schema.socket_instances
 set ip='FOO', event_name='BAR', port=12;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
 update performance_schema.socket_instances
 set ip='FOO';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
 delete from performance_schema.socket_instances
 where event_name like "wait/%";
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
 delete from performance_schema.socket_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
 LOCK TABLES performance_schema.socket_instances READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.socket_instances WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_instances`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result b/mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result
index 62085b067cc..8701f92dbb1 100644
--- a/mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result
+++ b/mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result
@@ -6,23 +6,23 @@ insert into performance_schema.socket_summary_by_event_name
 set event_name='FOO',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
 update performance_schema.socket_summary_by_event_name
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
 update performance_schema.socket_summary_by_event_name
 set count_star=12 where event_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
 delete from performance_schema.socket_summary_by_event_name
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
 delete from performance_schema.socket_summary_by_event_name;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
 LOCK TABLES performance_schema.socket_summary_by_event_name READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.socket_summary_by_event_name WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_summary_by_event_name'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_event_name`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result b/mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result
index 77baea763cb..ffbab5c7cdb 100644
--- a/mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result
+++ b/mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result
@@ -6,23 +6,23 @@ insert into performance_schema.socket_summary_by_instance
 set object_instance_begin=1,
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
 update performance_schema.socket_summary_by_instance
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
 update performance_schema.socket_summary_by_instance
 set count_star=12 where object_instance_begin like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
 delete from performance_schema.socket_summary_by_instance
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
 delete from performance_schema.socket_summary_by_instance;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
 LOCK TABLES performance_schema.socket_summary_by_instance READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.socket_summary_by_instance WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'socket_summary_by_instance'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`socket_summary_by_instance`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_account.result b/mysql-test/suite/perfschema/r/dml_status_by_account.result
index 1b45920c70b..7b107bd84c9 100644
--- a/mysql-test/suite/perfschema/r/dml_status_by_account.result
+++ b/mysql-test/suite/perfschema/r/dml_status_by_account.result
@@ -4,21 +4,21 @@ select * from performance_schema.status_by_account
 where variable_name='FOO';
 insert into performance_schema.status_by_account
 set user='USER', host='HOST', variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
 update performance_schema.status_by_account
 set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
 update performance_schema.status_by_account
 set variable_name='FOO' where user <> 'USER';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
 delete from performance_schema.status_by_account
 where user <> 'USER';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
 delete from performance_schema.status_by_account;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
 LOCK TABLES performance_schema.status_by_account READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.status_by_account WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_account'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_account`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_host.result b/mysql-test/suite/perfschema/r/dml_status_by_host.result
index cfe74eaabbf..99b83e2ada1 100644
--- a/mysql-test/suite/perfschema/r/dml_status_by_host.result
+++ b/mysql-test/suite/perfschema/r/dml_status_by_host.result
@@ -4,21 +4,21 @@ select * from performance_schema.status_by_host
 where variable_name='FOO';
 insert into performance_schema.status_by_host
 set host='HOST', variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
 update performance_schema.status_by_host
 set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
 update performance_schema.status_by_host
 set variable_name='FOO' where host <> 'HOST';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
 delete from performance_schema.status_by_host
 where host <> 'HOST';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
 delete from performance_schema.status_by_host;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
 LOCK TABLES performance_schema.status_by_host READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.status_by_host WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_host'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_host`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_thread.result b/mysql-test/suite/perfschema/r/dml_status_by_thread.result
index afe2cf407ed..9eab97891cb 100644
--- a/mysql-test/suite/perfschema/r/dml_status_by_thread.result
+++ b/mysql-test/suite/perfschema/r/dml_status_by_thread.result
@@ -4,21 +4,21 @@ select * from performance_schema.status_by_thread
 where variable_name='FOO';
 insert into performance_schema.status_by_thread
 set thread_id=1, variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
 update performance_schema.status_by_thread
 set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
 update performance_schema.status_by_thread
 set variable_name='FOO' where thread_id=0;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
 delete from performance_schema.status_by_thread
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
 delete from performance_schema.status_by_thread;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
 LOCK TABLES performance_schema.status_by_thread READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.status_by_thread WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_thread'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_thread`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_user.result b/mysql-test/suite/perfschema/r/dml_status_by_user.result
index 430bb622d3b..d81153aef5e 100644
--- a/mysql-test/suite/perfschema/r/dml_status_by_user.result
+++ b/mysql-test/suite/perfschema/r/dml_status_by_user.result
@@ -4,21 +4,21 @@ select * from performance_schema.status_by_user
 where variable_name='FOO';
 insert into performance_schema.status_by_user
 set user='USER', variable_name='FOO', variable_value='BAR';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
 update performance_schema.status_by_user
 set variable_name='FOO', variable_value='BAR';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
 update performance_schema.status_by_user
 set variable_name='FOO' where user <> 'USER';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
 delete from performance_schema.status_by_user
 where user <> 'USER';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
 delete from performance_schema.status_by_user;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
 LOCK TABLES performance_schema.status_by_user READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.status_by_user WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_user'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`status_by_user`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_table_handles.result b/mysql-test/suite/perfschema/r/dml_table_handles.result
index 5f6f0a43ad8..8089d5f66f8 100644
--- a/mysql-test/suite/perfschema/r/dml_table_handles.result
+++ b/mysql-test/suite/perfschema/r/dml_table_handles.result
@@ -4,18 +4,18 @@ where object_name='foo';
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	OWNER_THREAD_ID	OWNER_EVENT_ID	INTERNAL_LOCK	EXTERNAL_LOCK
 insert into performance_schema.table_handles
 set object_name='FOO', owner_event_id=1;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
 update performance_schema.table_handles
 set owner_event_id=12 where object_name='foo';
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
 delete from performance_schema.table_handles;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
 delete from performance_schema.table_handles
 where timer_name='CYCLE';
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
 LOCK TABLES performance_schema.table_handles READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.table_handles WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_handles'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_handles`
 UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_threads.result b/mysql-test/suite/perfschema/r/dml_threads.result
index 4826b3e66d9..c0c7281ba1a 100644
--- a/mysql-test/suite/perfschema/r/dml_threads.result
+++ b/mysql-test/suite/perfschema/r/dml_threads.result
@@ -4,7 +4,7 @@ select * from performance_schema.threads
 where name='FOO';
 insert into performance_schema.threads
 set name='FOO', thread_id=1, processlist_id=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'threads'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`threads`
 update performance_schema.threads
 set thread_id=12;
 ERROR HY000: Invalid performance_schema usage
@@ -25,9 +25,9 @@ instrumented
 YES
 delete from performance_schema.threads
 where id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'threads'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`threads`
 delete from performance_schema.threads;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'threads'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`threads`
 LOCK TABLES performance_schema.threads READ;
 UNLOCK TABLES;
 LOCK TABLES performance_schema.threads WRITE;
diff --git a/mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result b/mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result
index f7bb29cae4e..81ef27d3c70 100644
--- a/mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result
+++ b/mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result
@@ -6,23 +6,23 @@ insert into performance_schema.table_io_waits_summary_by_index_usage
 set object_type='TABLE', object_name='FOO', object_schema='BAR',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
 update performance_schema.table_io_waits_summary_by_index_usage
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
 update performance_schema.table_io_waits_summary_by_index_usage
 set count_star=12 where object_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
 delete from performance_schema.table_io_waits_summary_by_index_usage
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
 delete from performance_schema.table_io_waits_summary_by_index_usage;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
 LOCK TABLES performance_schema.table_io_waits_summary_by_index_usage READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.table_io_waits_summary_by_index_usage WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_index_usage'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_index_usage`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_tiws_by_table.result b/mysql-test/suite/perfschema/r/dml_tiws_by_table.result
index 5a83ddfa87e..46c8604c6c4 100644
--- a/mysql-test/suite/perfschema/r/dml_tiws_by_table.result
+++ b/mysql-test/suite/perfschema/r/dml_tiws_by_table.result
@@ -6,23 +6,23 @@ insert into performance_schema.table_io_waits_summary_by_table
 set object_type='TABLE', object_name='FOO', object_schema='BAR',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
 update performance_schema.table_io_waits_summary_by_table
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
 update performance_schema.table_io_waits_summary_by_table
 set count_star=12 where object_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
 delete from performance_schema.table_io_waits_summary_by_table
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
 delete from performance_schema.table_io_waits_summary_by_table;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
 LOCK TABLES performance_schema.table_io_waits_summary_by_table READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.table_io_waits_summary_by_table WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_io_waits_summary_by_table'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_io_waits_summary_by_table`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_tlws_by_table.result b/mysql-test/suite/perfschema/r/dml_tlws_by_table.result
index 24f6c79ac61..6d130abff50 100644
--- a/mysql-test/suite/perfschema/r/dml_tlws_by_table.result
+++ b/mysql-test/suite/perfschema/r/dml_tlws_by_table.result
@@ -6,23 +6,23 @@ insert into performance_schema.table_lock_waits_summary_by_table
 set object_type='TABLE', object_name='FOO', object_schema='BAR',
 count_star=1, sum_timer_wait=2, min_timer_wait=3,
 avg_timer_wait=4, max_timer_wait=5;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
 update performance_schema.table_lock_waits_summary_by_table
 set count_star=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
 update performance_schema.table_lock_waits_summary_by_table
 set count_star=12 where object_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
 delete from performance_schema.table_lock_waits_summary_by_table
 where count_star=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
 delete from performance_schema.table_lock_waits_summary_by_table;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
 LOCK TABLES performance_schema.table_lock_waits_summary_by_table READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.table_lock_waits_summary_by_table WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_lock_waits_summary_by_table'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`table_lock_waits_summary_by_table`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_users.result b/mysql-test/suite/perfschema/r/dml_users.result
index b38cf034bc0..53b220c79a5 100644
--- a/mysql-test/suite/perfschema/r/dml_users.result
+++ b/mysql-test/suite/perfschema/r/dml_users.result
@@ -5,23 +5,23 @@ where user='FOO';
 insert into performance_schema.users
 set user='FOO',
 current_connections=1, total_connections=2;
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`users`
 update performance_schema.users
 set current_connections=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`users`
 update performance_schema.users
 set current_connections=12 where user like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`users`
 delete from performance_schema.users
 where total_connections=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`users`
 delete from performance_schema.users;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`users`
 LOCK TABLES performance_schema.users READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`users`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.users WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'users'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`users`
 UNLOCK TABLES;
 #
 # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result b/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result
index ae6dc4ec3d9..7c9a7a3db8f 100644
--- a/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result
+++ b/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result
@@ -4,23 +4,23 @@ select * from performance_schema.user_variables_by_thread
 where variable_name='FOO';
 insert into performance_schema.user_variables_by_thread
 set thread_id=12, variable_name='foo', variable_value='bar';
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
 update performance_schema.user_variables_by_thread
 set thread_id=12;
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
 update performance_schema.user_variables_by_thread
 set thread_id=12 where variable_name like "FOO";
-ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
 delete from performance_schema.user_variables_by_thread
 where thread_id=1;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
 delete from performance_schema.user_variables_by_thread;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
 LOCK TABLES performance_schema.user_variables_by_thread READ;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
 UNLOCK TABLES;
 LOCK TABLES performance_schema.user_variables_by_thread WRITE;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`user_variables_by_thread`
 UNLOCK TABLES;
 CREATE TRIGGER test_uvar_trigger
 AFTER INSERT ON performance_schema.user_variables_by_thread
diff --git a/mysql-test/suite/perfschema/r/misc.result b/mysql-test/suite/perfschema/r/misc.result
index b1fa4f6c765..2258cbceea4 100644
--- a/mysql-test/suite/perfschema/r/misc.result
+++ b/mysql-test/suite/perfschema/r/misc.result
@@ -52,7 +52,7 @@ SELECT object_schema, object_name FROM performance_schema.objects_summary_global
 WHERE object_schema='test';
 object_schema	object_name
 create table performance_schema.t1(a int);
-ERROR 42000: CREATE command denied to user 'root'@'localhost' for table 't1'
+ERROR 42000: CREATE command denied to user 'root'@'localhost' for table `performance_schema`.`t1`
 SELECT object_schema, object_name FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema='test';
 object_schema	object_name
diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result
index c5e0ebf3c92..79d69b87ca7 100644
--- a/mysql-test/suite/perfschema/r/privilege.result
+++ b/mysql-test/suite/perfschema/r/privilege.result
@@ -56,9 +56,9 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_
 grant TRIGGER on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 grant INSERT on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
-ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
 grant DELETE on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
-ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
 grant SELECT on performance_schema.setup_instruments to 'pfs_user_3'@localhost
 with GRANT OPTION;
 grant UPDATE on performance_schema.setup_instruments to 'pfs_user_3'@localhost
@@ -81,11 +81,11 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_
 grant TRIGGER on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 grant INSERT on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
-ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 grant UPDATE on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
-ERROR 42000: UPDATE, GRANT command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: UPDATE, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 grant DELETE on performance_schema.events_waits_current to 'pfs_user_3'@localhost;
-ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 grant SELECT on performance_schema.events_waits_current to 'pfs_user_3'@localhost
 with GRANT OPTION;
 grant ALL on performance_schema.file_instances to 'pfs_user_3'@localhost
@@ -106,11 +106,11 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_
 grant TRIGGER on performance_schema.file_instances to 'pfs_user_3'@localhost;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 grant INSERT on performance_schema.file_instances to 'pfs_user_3'@localhost;
-ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 grant UPDATE on performance_schema.file_instances to 'pfs_user_3'@localhost;
-ERROR 42000: UPDATE, GRANT command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: UPDATE, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 grant DELETE on performance_schema.file_instances to 'pfs_user_3'@localhost;
-ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE, GRANT command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 grant SELECT on performance_schema.file_instances to 'pfs_user_3'@localhost
 with GRANT OPTION;
 grant LOCK TABLES on performance_schema.* to 'pfs_user_3'@localhost
@@ -164,34 +164,34 @@ create table test.t1 like performance_schema.file_instances;
 ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
 insert into performance_schema.setup_instruments
 set name="foo";
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
 insert into performance_schema.events_waits_current
 set name="foo";
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 insert into performance_schema.file_instances
 set name="foo";
-ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 delete from performance_schema.setup_instruments;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`setup_instruments`
 delete from performance_schema.events_waits_current;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 delete from performance_schema.file_instances;
-ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 lock table performance_schema.setup_instruments read;
 unlock tables;
 lock table performance_schema.setup_instruments write;
 unlock tables;
 lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 unlock tables;
 lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`events_waits_current`
 unlock tables;
 lock table performance_schema.file_instances read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 unlock tables;
 lock table performance_schema.file_instances write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table `performance_schema`.`file_instances`
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
@@ -263,34 +263,34 @@ create table test.t1 like performance_schema.file_instances;
 ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
 insert into performance_schema.setup_instruments
 set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`setup_instruments`
 insert into performance_schema.events_waits_current
 set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`events_waits_current`
 insert into performance_schema.file_instances
 set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`file_instances`
 delete from performance_schema.setup_instruments;
-ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`setup_instruments`
 delete from performance_schema.events_waits_current;
-ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`events_waits_current`
 delete from performance_schema.file_instances;
-ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`file_instances`
 lock table performance_schema.setup_instruments read;
 unlock tables;
 lock table performance_schema.setup_instruments write;
 unlock tables;
 lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`events_waits_current`
 unlock tables;
 lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`events_waits_current`
 unlock tables;
 lock table performance_schema.file_instances read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`file_instances`
 unlock tables;
 lock table performance_schema.file_instances write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_1'@'localhost' for table `performance_schema`.`file_instances`
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
@@ -363,34 +363,34 @@ create table test.t1 like performance_schema.file_instances;
 ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
 insert into performance_schema.setup_instruments
 set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`setup_instruments`
 insert into performance_schema.events_waits_current
 set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`events_waits_current`
 insert into performance_schema.file_instances
 set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`file_instances`
 delete from performance_schema.setup_instruments;
-ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`setup_instruments`
 delete from performance_schema.events_waits_current;
-ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`events_waits_current`
 delete from performance_schema.file_instances;
-ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`file_instances`
 lock table performance_schema.setup_instruments read;
 unlock tables;
 lock table performance_schema.setup_instruments write;
 unlock tables;
 lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`events_waits_current`
 unlock tables;
 lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`events_waits_current`
 unlock tables;
 lock table performance_schema.file_instances read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`file_instances`
 unlock tables;
 lock table performance_schema.file_instances write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_2'@'localhost' for table `performance_schema`.`file_instances`
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
@@ -463,34 +463,34 @@ create table test.t1 like performance_schema.file_instances;
 ERROR HY000: Can't create table `test`.`t1` (errno: 131 "Command not supported by the engine")
 insert into performance_schema.setup_instruments
 set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'
+ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`setup_instruments`
 insert into performance_schema.events_waits_current
 set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
+ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_current`
 insert into performance_schema.file_instances
 set name="foo";
-ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
+ERROR 42000: INSERT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`file_instances`
 delete from performance_schema.setup_instruments;
-ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'setup_instruments'
+ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`setup_instruments`
 delete from performance_schema.events_waits_current;
-ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
+ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_current`
 delete from performance_schema.file_instances;
-ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
+ERROR 42000: DELETE command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`file_instances`
 lock table performance_schema.setup_instruments read;
 unlock tables;
 lock table performance_schema.setup_instruments write;
 unlock tables;
 lock table performance_schema.events_waits_current read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_current`
 unlock tables;
 lock table performance_schema.events_waits_current write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_current`
 unlock tables;
 lock table performance_schema.file_instances read;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`file_instances`
 unlock tables;
 lock table performance_schema.file_instances write;
-ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table 'file_instances'
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`file_instances`
 unlock tables;
 #
 # WL#4818, NFS2: Can use grants to give normal user access
@@ -499,16 +499,16 @@ unlock tables;
 # Should work as pfs_user_1 and pfs_user_2, but not as pfs_user_3.
 # (Except for events_waits_current, which is granted.)
 SELECT "can select" FROM performance_schema.events_waits_history LIMIT 1;
-ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_history'
+ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_history`
 SELECT "can select" FROM performance_schema.events_waits_history_long LIMIT 1;
-ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_history_long`
 SELECT "can select" FROM performance_schema.events_waits_current LIMIT 1;
 can select
 can select
 SELECT "can select" FROM performance_schema.events_waits_summary_by_instance LIMIT 1;
-ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
 SELECT "can select" FROM performance_schema.file_summary_by_instance LIMIT 1;
-ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: SELECT command denied to user 'pfs_user_3'@'localhost' for table `performance_schema`.`file_summary_by_instance`
 disconnect con3;
 connection default;
 revoke all privileges, grant option from 'pfs_user_1'@localhost;
@@ -529,15 +529,15 @@ connect  pfs_user_4, localhost, pfs_user_4, , ;
 connection pfs_user_4;
 # Select as pfs_user_4 should fail without grant
 SELECT event_id FROM performance_schema.events_waits_history;
-ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history'
+ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_history`
 SELECT event_id FROM performance_schema.events_waits_history_long;
-ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_history_long`
 SELECT event_id FROM performance_schema.events_waits_current;
-ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_current'
+ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_current`
 SELECT event_name FROM performance_schema.events_waits_summary_by_instance;
-ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_summary_by_instance'
+ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_summary_by_instance`
 SELECT event_name FROM performance_schema.file_summary_by_instance;
-ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table 'file_summary_by_instance'
+ERROR 42000: SELECT command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`file_summary_by_instance`
 #
 # WL#4818, NFS3: Normal user does not have access to change what is
 #                instrumented without grants
@@ -546,21 +546,21 @@ connection pfs_user_4;
 # User pfs_user_4 should not be allowed to tweak instrumentation without
 # explicit grant
 UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
-ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_instruments'
+ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`setup_instruments`
 UPDATE performance_schema.setup_instruments SET enabled = 'YES'
 WHERE name LIKE 'wait/synch/mutex/%'
    OR name LIKE 'wait/synch/rwlock/%';
-ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_instruments'
+ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`setup_instruments`
 UPDATE performance_schema.setup_consumers SET enabled = 'YES';
-ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_consumers'
+ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`setup_consumers`
 UPDATE performance_schema.setup_timers SET timer_name = 'TICK';
-ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table 'setup_timers'
+ERROR 42000: UPDATE command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`setup_timers`
 TRUNCATE TABLE performance_schema.events_waits_history_long;
-ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history_long'
+ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_history_long`
 TRUNCATE TABLE performance_schema.events_waits_history;
-ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_history'
+ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_history`
 TRUNCATE TABLE performance_schema.events_waits_current;
-ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table 'events_waits_current'
+ERROR 42000: DROP command denied to user 'pfs_user_4'@'localhost' for table `performance_schema`.`events_waits_current`
 #
 # WL#4814, NFS1: Can use grants to give normal user access
 #                to turn on and off instrumentation
diff --git a/mysql-test/suite/perfschema/r/setup_actors.result b/mysql-test/suite/perfschema/r/setup_actors.result
index b6d528173bf..4fda296fc5a 100644
--- a/mysql-test/suite/perfschema/r/setup_actors.result
+++ b/mysql-test/suite/perfschema/r/setup_actors.result
@@ -115,7 +115,7 @@ from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
 connect  con5, localhost, user5, , ;
 select * from performance_schema.threads;
-ERROR 42000: SELECT command denied to user 'user5'@'localhost' for table 'threads'
+ERROR 42000: SELECT command denied to user 'user5'@'localhost' for table `performance_schema`.`threads`
 select * from test.v1;
 NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	YES	user5	localhost
diff --git a/mysql-test/suite/perfschema/r/setup_actors_enabled.result b/mysql-test/suite/perfschema/r/setup_actors_enabled.result
index c0dda748f28..f71cfdbd47a 100644
--- a/mysql-test/suite/perfschema/r/setup_actors_enabled.result
+++ b/mysql-test/suite/perfschema/r/setup_actors_enabled.result
@@ -72,7 +72,7 @@ flush privileges;
 connect  con2, localhost, user2, , ;
 update performance_schema.setup_actors 
 set ENABLED='NO';
-ERROR 42000: UPDATE command denied to user 'user2'@'localhost' for table 'setup_actors'
+ERROR 42000: UPDATE command denied to user 'user2'@'localhost' for table `performance_schema`.`setup_actors`
 disconnect con2;
 connection default;
 insert into performance_schema.setup_actors