Merge branch '10.6' into 10.7

164 files changed, 3476 insertions, 3232 deletions

diff --git a/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result b/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result
index 13de367a9b8..8425e0ad17a 100644
--- a/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result
+++ b/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result
@@ -145,7 +145,7 @@ INSERT INTO t2 VALUES (1, REPEAT("x", 1));
 BEGIN;
 INSERT INTO t2 VALUES (2, REPEAT("x", 4100));
 INSERT INTO t1 VALUES (2, REPEAT("x", 4100));
-SET DEBUG_SYNC= "commit_after_run_commit_ordered SIGNAL con1_ready WAIT_FOR signal_no_signal";
+SET DEBUG_SYNC= "commit_after_run_commit_ordered SIGNAL con1_ready";
 COMMIT;
 connection default;
 SET DEBUG_SYNC= "now WAIT_FOR con1_ready";
diff --git a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
index 896bc11686b..12b0a743916 100644
--- a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
+++ b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
@@ -47,7 +47,7 @@ CREATE TABLE t2 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=rocksdb;
 
 --let $case = "C"
 --let $description= "both engines have committed its transaction branch"
---let $debug_sync_action = "commit_after_run_commit_ordered SIGNAL con1_ready WAIT_FOR signal_no_signal"
+--let $debug_sync_action = "commit_after_run_commit_ordered SIGNAL con1_ready"
 # Hold off after both engines have committed. The server is shut down.
 --let $shutdown_timeout=
 --let $restart_parameters = --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
diff --git a/mysql-test/suite/compat/oracle/r/sp-security.result b/mysql-test/suite/compat/oracle/r/sp-security.result
index b98ecaca972..db29a17a210 100644
--- a/mysql-test/suite/compat/oracle/r/sp-security.result
+++ b/mysql-test/suite/compat/oracle/r/sp-security.result
@@ -23,9 +23,9 @@ user1@localhost
 # Making sure that user1 does not have privileges to db1.t1
 #
 SHOW CREATE TABLE db1.t1;
-ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table `db1`.`t1`
 SHOW FIELDS IN db1.t1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
 #
 # Trigger: using %TYPE with a table we don't have access to
 #
@@ -43,7 +43,7 @@ END;
 END
 $$
 INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
 SELECT * FROM t1;
 a	b
 10	20
@@ -61,7 +61,7 @@ SELECT a;
 END;
 $$
 CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
 DROP PROCEDURE p1;
 CREATE PROCEDURE p1()
 AS
@@ -71,7 +71,7 @@ SELECT a.a;
 END;
 $$
 CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
 DROP PROCEDURE p1;
 #
 # Stored procedure: Using %TYPE for with a table that we don't have access to
@@ -88,7 +88,7 @@ END;
 $$
 connection conn1;
 CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
 DROP PROCEDURE p1;
 connection default;
 CREATE PROCEDURE p1()
@@ -101,7 +101,7 @@ END;
 $$
 connection conn1;
 CALL p1;
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
 DROP PROCEDURE p1;
 #
 # Stored procedure: Using %TYPE for with a table that we don't have access to
@@ -149,7 +149,7 @@ RETURN OCTET_LENGTH(a);
 END;
 $$
 SELECT f1();
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
 DROP FUNCTION f1;
 DROP TABLE t1;
 #
@@ -168,7 +168,7 @@ END;
 $$
 connection conn1;
 SELECT f1();
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1`.`t1`
 DROP FUNCTION f1;
 DROP TABLE t1;
 #
@@ -198,7 +198,7 @@ connection conn1;
 # Making sure that user1 has access to db1.t1.a, but not to db1.t1.b
 #
 SHOW CREATE TABLE db1.t1;
-ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SHOW command denied to user 'user1'@'localhost' for table `db1`.`t1`
 SHOW FIELDS IN db1.t1;
 Field	Type	Null	Key	Default	Extra
 a	int(11)	YES		NULL	
diff --git a/mysql-test/suite/encryption/r/debug_key_management.result b/mysql-test/suite/encryption/r/debug_key_management.result
index 911a369f0c6..7fe681d52ae 100644
--- a/mysql-test/suite/encryption/r/debug_key_management.result
+++ b/mysql-test/suite/encryption/r/debug_key_management.result
@@ -15,7 +15,6 @@ set global debug_key_management_version=10;
 select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10;
 count(*)
 0
-SET GLOBAL debug_dbug = '+d,ib_log';
 SET GLOBAL innodb_log_checkpoint_now = 1;
 SET GLOBAL innodb_flush_log_at_trx_commit = 1;
 INSERT INTO t1 VALUES(NULL);
diff --git a/mysql-test/suite/encryption/t/debug_key_management.test b/mysql-test/suite/encryption/t/debug_key_management.test
index c370ecf5bd8..15a560d4c42 100644
--- a/mysql-test/suite/encryption/t/debug_key_management.test
+++ b/mysql-test/suite/encryption/t/debug_key_management.test
@@ -25,7 +25,6 @@ let $wait_condition= select count(*) = $tables_count from information_schema.inn
 select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10;
 
 # Test redo log key rotation and crash recovery.
-SET GLOBAL debug_dbug = '+d,ib_log';
 SET GLOBAL innodb_log_checkpoint_now = 1;
 SET GLOBAL innodb_flush_log_at_trx_commit = 1;
 INSERT INTO t1 VALUES(NULL);
diff --git a/mysql-test/suite/engines/funcs/r/rpl_sp.result b/mysql-test/suite/engines/funcs/r/rpl_sp.result
index 00b15c36baa..d158fe8bfd6 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_sp.result
+++ b/mysql-test/suite/engines/funcs/r/rpl_sp.result
@@ -301,7 +301,7 @@ select * from t2;
 a
 connection con1;
 create trigger trg before insert on t1 for each row set new.a= 10;
-ERROR 42000: TRIGGER command denied to user 'zedjzlcsjhd'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'zedjzlcsjhd'@'localhost' for table `mysqltest1`.`t1`
 connection master;
 delete from t1;
 create trigger trg before insert on t1 for each row set new.a= 10;
diff --git a/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
index 6db6e374ca7..88269f25a01 100644
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
@@ -221,31 +221,31 @@ connect  user5_2, localhost, user_2, , db_storedproc_1;
 	
 user_2@localhost	db_storedproc_1
 CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 connection default;
 	
 root@localhost	db_storedproc_1
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 grant insert on db_storedproc_1.* to 'user_1'@'localhost';
 flush privileges;
 connection user5_2;
 	
 user_2@localhost	db_storedproc_1
 CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 connection default;
 	
 root@localhost	db_storedproc_1
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 grant SELECT on db_storedproc_1.* to 'user_1'@'localhost';
 flush privileges;
 connection user5_2;
@@ -276,9 +276,9 @@ inserted	outside of SP	NULL
 inserted	from sp5_ins	2000-10-00
 inserted	from sp5_s_i	2000-10-00
 inserted	from sp5_ins	2000-10-00
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_sel();
 c1	c2	c3
 inserted	outside of SP	NULL
@@ -294,11 +294,11 @@ connection user5_2;
 	
 user_2@localhost	db_storedproc_1
 CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 disconnect user5_2;
 connection default;
 	
@@ -348,9 +348,9 @@ user_2@localhost	db_storedproc_1
 CALL sp3166_s_i();
 c1
 inserted outside SP
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 CALL sp3166_ins();
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 CALL sp3166_sel();
 c1
 inserted outside SP
@@ -390,10 +390,10 @@ connect  user6_4, localhost, user_2, , db_storedproc_1;
 	
 user_2@localhost	db_storedproc_1
 CALL sp3166_s_i();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 CALL sp3166_ins();
 CALL sp3166_sel();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 disconnect user6_4;
 connection default;
 CALL sp3166_s_i();
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03.result b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
index 92cbff3fafb..051e0d1e125 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03.result
@@ -99,7 +99,7 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
@@ -135,7 +135,7 @@ Testcase 3.5.3.6:
 connection no_privs;
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
@@ -688,7 +688,7 @@ insert into t2 values (new.f1);
 connection default;
 use priv_db;
 insert into t1 (f1) values (4);
-ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
@@ -706,7 +706,7 @@ update t2 set f2=new.f1-1;
 connection default;
 use priv_db;
 insert into t1 (f1) values (2);
-ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
@@ -725,7 +725,7 @@ select f2 into @aaa from t2 where f2=new.f1;
 connection default;
 use priv_db;
 insert into t1 (f1) values (1);
-ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
@@ -748,7 +748,7 @@ delete from t2;
 connection default;
 use priv_db;
 insert into t1 (f1) values (1);
-ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result
index 875aa18e81f..6ec5240792c 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_03e.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_03e.result
@@ -31,7 +31,7 @@ no trigger privilege on db level for create:
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connect  no_privs,localhost,test_noprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 use priv_db;
 insert into t1 (f1) values ('insert-yes');
@@ -107,7 +107,7 @@ current_user
 test_yesprivs@localhost
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -117,7 +117,7 @@ use priv_db;
 no trigger privilege at activation time:
 ----------------------------------------
 insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 insert-yes
@@ -155,7 +155,7 @@ Grants for test_yesprivs@localhost
 GRANT USAGE ON *.* TO `test_yesprivs`@`localhost` IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, UPDATE, TRIGGER ON `priv_db`.* TO `test_yesprivs`@`localhost`
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 
 takes effect after use priv_db:
 -------------------------------
@@ -195,14 +195,14 @@ test_yesprivs@localhost
 use no_priv_db;
 create trigger trg1_3 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_3-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 use priv_db;
 create trigger trg1_3 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_3-yes';
 use no_priv_db;
 create trigger trg1_4 before UPDATE  on t1 for each row
 set new.f1 = 'trig 1_4-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 use priv_db;
 create trigger trg1_4 before UPDATE  on t1 for each row
 set new.f1 = 'trig 1_4-yes';
@@ -302,7 +302,7 @@ Tables_in_priv_db
 t1
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -376,7 +376,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 
 no trigger privilege at activation time:
 ----------------------------------------
@@ -385,7 +385,7 @@ select current_user;
 current_user
 test_noprivs@localhost
 insert into t1 (f1) values ('insert5-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 insert1-yes
@@ -476,12 +476,12 @@ current_user
 test_yesprivs@localhost
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 create trigger trg1_3 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_3-yes';
 create trigger trg2_2 before UPDATE  on t2 for each row
 set new.f1 = 'trig 2_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 create trigger trg1_4 before UPDATE  on t1 for each row
 set new.f1 = 'trig 1_4-yes';
 show triggers;
@@ -615,7 +615,7 @@ Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_clie
 select * from information_schema.triggers;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
 drop trigger trg1_1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -635,7 +635,7 @@ current_user
 test_yesprivs@localhost
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -671,11 +671,11 @@ set new.f1 = 'trig 1_2-yes';
 create trigger no_priv_db.trg1_9 before insert on no_priv_db.t1
 for each row
 set new.f1 = 'trig 1_9-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 use no_priv_db;
 create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 create trigger priv_db.trg1_9 before UPDATE on priv_db.t1
 for each row
 set new.f1 = 'trig 1_9-yes';
@@ -699,7 +699,7 @@ select f1 from t1 order by f1;
 f1
 insert-yes
 drop trigger priv_db.trg1_9;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -708,7 +708,7 @@ drop trigger priv_db.trg1_9;
 revoke TRIGGER on priv_db.* from test_yesprivs@localhost;
 use priv_db;
 insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 insert-yes
@@ -728,7 +728,7 @@ test_yesprivs@localhost
 use no_priv_db;
 create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -843,7 +843,7 @@ set new.f1 = 'trig 2_1-yes';
 use priv2_db;
 create trigger trg1_1 before INSERT  on t1 for each row
 set new.f1 = 'trig1_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv2_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -918,7 +918,7 @@ test_yesprivs@localhost
 use priv1_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -945,7 +945,7 @@ create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-yes';
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
 connection no_privs;
 select current_user;
 current_user
@@ -986,7 +986,7 @@ current_user
 test_yesprivs@localhost
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
 use priv1_db;
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-yes';
@@ -1110,7 +1110,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1122,7 +1122,7 @@ current_user
 test_useprivs@localhost
 prepare ins1 from 'insert into t1 (f1) values (''insert5-no'')';
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1173,7 +1173,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1185,7 +1185,7 @@ select current_user;
 current_user
 test_useprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1240,7 +1240,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1255,7 +1255,7 @@ select current_user;
 current_user
 test_useprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1323,11 +1323,11 @@ current_user
 test_yesprivs@localhost
 use priv_db;
 insert into t1 (f1) values ('insert-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 drop trigger trg1_0;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -1638,12 +1638,12 @@ update t1 set f1 = 'update6_no'
                 where f1 like '%insert%';
 update t2 set f1 = 'update6_no'
                 where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 update t1 set f1 = 'update7_no'
                 where f1 like '%insert%';
 update t2 set f1 = 'update7_no'
                 where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1669,7 +1669,7 @@ test_noprivs@localhost
 update t1 set   f1 = 'update8-no',
 f2 = 'update8-no'
                 where f2 like '%yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select * from t1 order by f1,f2,f3;
 f1	f2	f3
 trig 1_1-yes	NULL	NULL
@@ -1743,7 +1743,7 @@ current_user
 test_noprivs@localhost
 use priv_db;
 update t1 set f3= f3+1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f3 from t1 order by f3;
 f3
 NULL
diff --git a/mysql-test/suite/funcs_1/r/is_columns.result b/mysql-test/suite/funcs_1/r/is_columns.result
index e8ca653d11d..7cd949c36aa 100644
--- a/mysql-test/suite/funcs_1/r/is_columns.result
+++ b/mysql-test/suite/funcs_1/r/is_columns.result
@@ -170,7 +170,7 @@ Field	Type	Null	Key	Default	Extra
 f1	char(10)	YES	MUL	NULL	
 f2	text	YES		NULL	
 SHOW COLUMNS FROM db_datadict.t2;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `db_datadict`.`t2`
 SHOW COLUMNS FROM db_datadict.v1;
 Field	Type	Null	Key	Default	Extra
 f2	int(1)	NO		0	
@@ -182,13 +182,13 @@ TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAUL
 def	db_datadict	t2	f1	1	NULL	NO	char	10	10	NULL	NULL	NULL	latin1	latin1_swedish_ci	char(10)	PRI		insert		NEVER	NULL
 def	db_datadict	t2	f2	2	NULL	YES	text	65535	65535	NULL	NULL	NULL	latin1	latin1_swedish_ci	text			insert		NEVER	NULL
 SHOW COLUMNS FROM db_datadict.t1;
-ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table `db_datadict`.`t1`
 SHOW COLUMNS FROM db_datadict.t2;
 Field	Type	Null	Key	Default	Extra
 f1	char(10)	NO	PRI	NULL	
 f2	text	YES		NULL	
 SHOW COLUMNS FROM db_datadict.v1;
-ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table `db_datadict`.`v1`
 connection default;
 disconnect testuser1;
 disconnect testuser2;
diff --git a/mysql-test/suite/funcs_1/r/is_table_constraints.result b/mysql-test/suite/funcs_1/r/is_table_constraints.result
index ff1d7bbdd94..a41576629b6 100644
--- a/mysql-test/suite/funcs_1/r/is_table_constraints.result
+++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result
@@ -151,7 +151,7 @@ t1	0	my_idx1	1	f6	###	###	###	###	###	###	###		NO
 t1	0	my_idx1	2	f1	###	###	###	###	###	###	###		NO
 t1	0	my_idx2	1	f3	###	###	###	###	###	###	###		NO
 SHOW INDEXES FROM db_datadict.t2;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `db_datadict`.`t2`
 connection default;
 disconnect testuser1;
 DROP USER 'testuser1'@'localhost';
diff --git a/mysql-test/suite/funcs_1/r/is_triggers.result b/mysql-test/suite/funcs_1/r/is_triggers.result
index 0411fc83eb9..6a1aed781da 100644
--- a/mysql-test/suite/funcs_1/r/is_triggers.result
+++ b/mysql-test/suite/funcs_1/r/is_triggers.result
@@ -172,9 +172,9 @@ Grants for testuser4@localhost
 GRANT TRIGGER ON *.* TO `testuser4`@`localhost`
 # TRIGGER Privilege + no SELECT Privilege on t1 --> result for query
 SELECT * FROM db_datadict.t1;
-ERROR 42000: SELECT command denied to user 'testuser4'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'testuser4'@'localhost' for table `db_datadict`.`t1`
 DESC db_datadict.t1;
-ERROR 42000: SELECT command denied to user 'testuser4'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'testuser4'@'localhost' for table `db_datadict`.`t1`
 SELECT * FROM information_schema.triggers
 WHERE trigger_name = 'trg1';
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
diff --git a/mysql-test/suite/funcs_1/r/is_user_privileges.result b/mysql-test/suite/funcs_1/r/is_user_privileges.result
index a42c579ec1e..4228c744e46 100644
--- a/mysql-test/suite/funcs_1/r/is_user_privileges.result
+++ b/mysql-test/suite/funcs_1/r/is_user_privileges.result
@@ -367,7 +367,7 @@ PRIVILEGE_TYPE	UPDATE
 IS_GRANTABLE	NO
 SELECT host,user,json_detailed(priv) FROM mysql.global_priv
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table 'global_priv'
+ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table `mysql`.`global_priv`
 SHOW GRANTS;
 Grants for testuser2@localhost
 GRANT INSERT, UPDATE ON *.* TO `testuser2`@`localhost`
@@ -381,7 +381,7 @@ PRIVILEGE_TYPE	USAGE
 IS_GRANTABLE	NO
 SELECT host,user,json_detailed(priv) FROM mysql.global_priv
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser3'@'localhost' for table 'global_priv'
+ERROR 42000: SELECT command denied to user 'testuser3'@'localhost' for table `mysql`.`global_priv`
 SHOW GRANTS;
 Grants for testuser3@localhost
 GRANT USAGE ON *.* TO `testuser3`@`localhost`
@@ -447,12 +447,12 @@ PRIVILEGE_TYPE	USAGE
 IS_GRANTABLE	NO
 SELECT host,user,json_detailed(priv) FROM mysql.global_priv
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'global_priv'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `mysql`.`global_priv`
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT USAGE ON *.* TO `testuser1`@`localhost`
 CREATE TABLE db_datadict.tb_55 ( c1 TEXT );
-ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table 'tb_55'
+ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table `db_datadict`.`tb_55`
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''
 ORDER BY grantee, table_catalog, privilege_type;
@@ -462,12 +462,12 @@ PRIVILEGE_TYPE	USAGE
 IS_GRANTABLE	NO
 SELECT host,user,json_detailed(priv) FROM mysql.global_priv
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'global_priv'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `mysql`.`global_priv`
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT USAGE ON *.* TO `testuser1`@`localhost`
 CREATE TABLE db_datadict.tb_66 ( c1 TEXT );
-ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table 'tb_66'
+ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table `db_datadict`.`tb_66`
 
 # Add ALL on db_datadict.* (and select on mysql.global_priv) to testuser1;
 connection default;
@@ -564,7 +564,7 @@ GRANT USAGE ON *.* TO `testuser1`@`localhost`
 GRANT ALL PRIVILEGES ON `db_datadict`.* TO `testuser1`@`localhost` WITH GRANT OPTION
 GRANT SELECT ON `mysql`.`global_priv` TO `testuser1`@`localhost`
 CREATE TABLE db_datadict.tb_56 ( c1 TEXT );
-ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table 'tb_56'
+ERROR 42000: CREATE command denied to user 'testuser1'@'localhost' for table `db_datadict`.`tb_56`
 USE db_datadict;
 SELECT * FROM information_schema.user_privileges
 WHERE grantee LIKE '''testuser%'''
@@ -671,7 +671,7 @@ PRIVILEGE_TYPE	USAGE
 IS_GRANTABLE	NO
 SELECT host,user,json_detailed(priv) FROM mysql.global_priv
 WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'global_priv'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `mysql`.`global_priv`
 SHOW GRANTS;
 Grants for testuser1@localhost
 GRANT USAGE ON *.* TO `testuser1`@`localhost`
diff --git a/mysql-test/suite/funcs_1/r/memory_storedproc_06.result b/mysql-test/suite/funcs_1/r/memory_storedproc_06.result
index ce1ee82e89a..694cfc0158f 100644
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_06.result
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_06.result
@@ -221,31 +221,31 @@ connect  user5_2, localhost, user_2, , db_storedproc_1;
 	
 user_2@localhost	db_storedproc_1
 CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 connection default;
 	
 root@localhost	db_storedproc_1
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 grant insert on db_storedproc_1.* to 'user_1'@'localhost';
 flush privileges;
 connection user5_2;
 	
 user_2@localhost	db_storedproc_1
 CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 connection default;
 	
 root@localhost	db_storedproc_1
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 grant SELECT on db_storedproc_1.* to 'user_1'@'localhost';
 flush privileges;
 connection user5_2;
@@ -276,9 +276,9 @@ inserted	outside of SP	NULL
 inserted	from sp5_ins	2000-10-00
 inserted	from sp5_s_i	2000-10-00
 inserted	from sp5_ins	2000-10-00
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_sel();
 c1	c2	c3
 inserted	outside of SP	NULL
@@ -294,11 +294,11 @@ connection user5_2;
 	
 user_2@localhost	db_storedproc_1
 CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 disconnect user5_2;
 connection default;
 	
@@ -348,9 +348,9 @@ user_2@localhost	db_storedproc_1
 CALL sp3166_s_i();
 c1
 inserted outside SP
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 CALL sp3166_ins();
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 CALL sp3166_sel();
 c1
 inserted outside SP
@@ -390,10 +390,10 @@ connect  user6_4, localhost, user_2, , db_storedproc_1;
 	
 user_2@localhost	db_storedproc_1
 CALL sp3166_s_i();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 CALL sp3166_ins();
 CALL sp3166_sel();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 disconnect user6_4;
 connection default;
 CALL sp3166_s_i();
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03.result b/mysql-test/suite/funcs_1/r/memory_trig_03.result
index 68969afc97f..b76e7d01f59 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03.result
@@ -99,7 +99,7 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
@@ -135,7 +135,7 @@ Testcase 3.5.3.6:
 connection no_privs;
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
@@ -688,7 +688,7 @@ insert into t2 values (new.f1);
 connection default;
 use priv_db;
 insert into t1 (f1) values (4);
-ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
@@ -706,7 +706,7 @@ update t2 set f2=new.f1-1;
 connection default;
 use priv_db;
 insert into t1 (f1) values (2);
-ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
@@ -725,7 +725,7 @@ select f2 into @aaa from t2 where f2=new.f1;
 connection default;
 use priv_db;
 insert into t1 (f1) values (1);
-ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
@@ -748,7 +748,7 @@ delete from t2;
 connection default;
 use priv_db;
 insert into t1 (f1) values (1);
-ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_03e.result b/mysql-test/suite/funcs_1/r/memory_trig_03e.result
index d100bdfc824..c40cbd0ab72 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_03e.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_03e.result
@@ -32,7 +32,7 @@ no trigger privilege on db level for create:
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connect  no_privs,localhost,test_noprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 use priv_db;
 insert into t1 (f1) values ('insert-yes');
@@ -108,7 +108,7 @@ current_user
 test_yesprivs@localhost
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -118,7 +118,7 @@ use priv_db;
 no trigger privilege at activation time:
 ----------------------------------------
 insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 insert-yes
@@ -156,7 +156,7 @@ Grants for test_yesprivs@localhost
 GRANT USAGE ON *.* TO `test_yesprivs`@`localhost` IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, UPDATE, TRIGGER ON `priv_db`.* TO `test_yesprivs`@`localhost`
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 
 takes effect after use priv_db:
 -------------------------------
@@ -196,14 +196,14 @@ test_yesprivs@localhost
 use no_priv_db;
 create trigger trg1_3 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_3-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 use priv_db;
 create trigger trg1_3 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_3-yes';
 use no_priv_db;
 create trigger trg1_4 before UPDATE  on t1 for each row
 set new.f1 = 'trig 1_4-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 use priv_db;
 create trigger trg1_4 before UPDATE  on t1 for each row
 set new.f1 = 'trig 1_4-yes';
@@ -303,7 +303,7 @@ Tables_in_priv_db
 t1
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -377,7 +377,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 
 no trigger privilege at activation time:
 ----------------------------------------
@@ -386,7 +386,7 @@ select current_user;
 current_user
 test_noprivs@localhost
 insert into t1 (f1) values ('insert5-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 insert1-yes
@@ -477,12 +477,12 @@ current_user
 test_yesprivs@localhost
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 create trigger trg1_3 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_3-yes';
 create trigger trg2_2 before UPDATE  on t2 for each row
 set new.f1 = 'trig 2_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 create trigger trg1_4 before UPDATE  on t1 for each row
 set new.f1 = 'trig 1_4-yes';
 show triggers;
@@ -616,7 +616,7 @@ Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_clie
 select * from information_schema.triggers;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
 drop trigger trg1_1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -636,7 +636,7 @@ current_user
 test_yesprivs@localhost
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -672,11 +672,11 @@ set new.f1 = 'trig 1_2-yes';
 create trigger no_priv_db.trg1_9 before insert on no_priv_db.t1
 for each row
 set new.f1 = 'trig 1_9-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 use no_priv_db;
 create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 create trigger priv_db.trg1_9 before UPDATE on priv_db.t1
 for each row
 set new.f1 = 'trig 1_9-yes';
@@ -700,7 +700,7 @@ select f1 from t1 order by f1;
 f1
 insert-yes
 drop trigger priv_db.trg1_9;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -709,7 +709,7 @@ drop trigger priv_db.trg1_9;
 revoke TRIGGER on priv_db.* from test_yesprivs@localhost;
 use priv_db;
 insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 insert-yes
@@ -729,7 +729,7 @@ test_yesprivs@localhost
 use no_priv_db;
 create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -844,7 +844,7 @@ set new.f1 = 'trig 2_1-yes';
 use priv2_db;
 create trigger trg1_1 before INSERT  on t1 for each row
 set new.f1 = 'trig1_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv2_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -919,7 +919,7 @@ test_yesprivs@localhost
 use priv1_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -946,7 +946,7 @@ create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-yes';
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
 connection no_privs;
 select current_user;
 current_user
@@ -987,7 +987,7 @@ current_user
 test_yesprivs@localhost
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
 use priv1_db;
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-yes';
@@ -1111,7 +1111,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1123,7 +1123,7 @@ current_user
 test_useprivs@localhost
 prepare ins1 from 'insert into t1 (f1) values (''insert5-no'')';
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1174,7 +1174,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1186,7 +1186,7 @@ select current_user;
 current_user
 test_useprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1241,7 +1241,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1256,7 +1256,7 @@ select current_user;
 current_user
 test_useprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1324,11 +1324,11 @@ current_user
 test_yesprivs@localhost
 use priv_db;
 insert into t1 (f1) values ('insert-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 drop trigger trg1_0;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -1577,12 +1577,12 @@ update t1 set f1 = 'update6_no'
                 where f1 like '%insert%';
 update t2 set f1 = 'update6_no'
                 where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 update t1 set f1 = 'update7_no'
                 where f1 like '%insert%';
 update t2 set f1 = 'update7_no'
                 where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1608,7 +1608,7 @@ test_noprivs@localhost
 update t1 set   f1 = 'update8-no',
 f2 = 'update8-no'
                 where f2 like '%yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select * from t1 order by f1,f2,f3;
 f1	f2	f3
 trig 1_1-yes	NULL	NULL
@@ -1682,7 +1682,7 @@ current_user
 test_noprivs@localhost
 use priv_db;
 update t1 set f3= f3+1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f3 from t1 order by f3;
 f3
 NULL
diff --git a/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
index ce1ee82e89a..694cfc0158f 100644
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
@@ -221,31 +221,31 @@ connect  user5_2, localhost, user_2, , db_storedproc_1;
 	
 user_2@localhost	db_storedproc_1
 CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 connection default;
 	
 root@localhost	db_storedproc_1
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 grant insert on db_storedproc_1.* to 'user_1'@'localhost';
 flush privileges;
 connection user5_2;
 	
 user_2@localhost	db_storedproc_1
 CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 connection default;
 	
 root@localhost	db_storedproc_1
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 grant SELECT on db_storedproc_1.* to 'user_1'@'localhost';
 flush privileges;
 connection user5_2;
@@ -276,9 +276,9 @@ inserted	outside of SP	NULL
 inserted	from sp5_ins	2000-10-00
 inserted	from sp5_s_i	2000-10-00
 inserted	from sp5_ins	2000-10-00
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_sel();
 c1	c2	c3
 inserted	outside of SP	NULL
@@ -294,11 +294,11 @@ connection user5_2;
 	
 user_2@localhost	db_storedproc_1
 CALL sp5_s_i();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_ins();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 CALL sp5_sel();
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't3165'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db_storedproc_1`.`t3165`
 disconnect user5_2;
 connection default;
 	
@@ -348,9 +348,9 @@ user_2@localhost	db_storedproc_1
 CALL sp3166_s_i();
 c1
 inserted outside SP
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 CALL sp3166_ins();
-ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: INSERT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 CALL sp3166_sel();
 c1
 inserted outside SP
@@ -390,10 +390,10 @@ connect  user6_4, localhost, user_2, , db_storedproc_1;
 	
 user_2@localhost	db_storedproc_1
 CALL sp3166_s_i();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 CALL sp3166_ins();
 CALL sp3166_sel();
-ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table 't3166'
+ERROR 42000: SELECT command denied to user 'user_2'@'localhost' for table `db_storedproc_1`.`t3166`
 disconnect user6_4;
 connection default;
 CALL sp3166_s_i();
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03.result b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
index 68969afc97f..b76e7d01f59 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03.result
@@ -99,7 +99,7 @@ test_noprivs@localhost
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 3.5.3.2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.2-no');
@@ -135,7 +135,7 @@ Testcase 3.5.3.6:
 connection no_privs;
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 use priv_db;
 insert into t1 (f1) values ('insert 3.5.3.6-yes');
@@ -688,7 +688,7 @@ insert into t2 values (new.f1);
 connection default;
 use priv_db;
 insert into t1 (f1) values (4);
-ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: INSERT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant INSERT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (4);
@@ -706,7 +706,7 @@ update t2 set f2=new.f1-1;
 connection default;
 use priv_db;
 insert into t1 (f1) values (2);
-ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: UPDATE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke INSERT on priv_db.t2 from test_yesprivs@localhost;
 grant UPDATE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (2);
@@ -725,7 +725,7 @@ select f2 into @aaa from t2 where f2=new.f1;
 connection default;
 use priv_db;
 insert into t1 (f1) values (1);
-ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke UPDATE on priv_db.t2 from test_yesprivs@localhost;
 grant SELECT on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
@@ -748,7 +748,7 @@ delete from t2;
 connection default;
 use priv_db;
 insert into t1 (f1) values (1);
-ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: DELETE command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 revoke SELECT on priv_db.t2 from test_yesprivs@localhost;
 grant DELETE on priv_db.t2 to test_yesprivs@localhost;
 insert into t1 (f1) values (1);
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result
index 22db7ad337e..71cf064d201 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_03e.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_03e.result
@@ -32,7 +32,7 @@ no trigger privilege on db level for create:
 use priv_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connect  no_privs,localhost,test_noprivs,PWD,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 use priv_db;
 insert into t1 (f1) values ('insert-yes');
@@ -108,7 +108,7 @@ current_user
 test_yesprivs@localhost
 use priv_db;
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -118,7 +118,7 @@ use priv_db;
 no trigger privilege at activation time:
 ----------------------------------------
 insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 insert-yes
@@ -156,7 +156,7 @@ Grants for test_yesprivs@localhost
 GRANT USAGE ON *.* TO `test_yesprivs`@`localhost` IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'
 GRANT SELECT, UPDATE, TRIGGER ON `priv_db`.* TO `test_yesprivs`@`localhost`
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 
 takes effect after use priv_db:
 -------------------------------
@@ -196,14 +196,14 @@ test_yesprivs@localhost
 use no_priv_db;
 create trigger trg1_3 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_3-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 use priv_db;
 create trigger trg1_3 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_3-yes';
 use no_priv_db;
 create trigger trg1_4 before UPDATE  on t1 for each row
 set new.f1 = 'trig 1_4-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 use priv_db;
 create trigger trg1_4 before UPDATE  on t1 for each row
 set new.f1 = 'trig 1_4-yes';
@@ -303,7 +303,7 @@ Tables_in_priv_db
 t1
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -377,7 +377,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 drop trigger trg1_2;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 
 no trigger privilege at activation time:
 ----------------------------------------
@@ -386,7 +386,7 @@ select current_user;
 current_user
 test_noprivs@localhost
 insert into t1 (f1) values ('insert5-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 insert1-yes
@@ -477,12 +477,12 @@ current_user
 test_yesprivs@localhost
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 create trigger trg1_3 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_3-yes';
 create trigger trg2_2 before UPDATE  on t2 for each row
 set new.f1 = 'trig 2_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 create trigger trg1_4 before UPDATE  on t1 for each row
 set new.f1 = 'trig 1_4-yes';
 show triggers;
@@ -616,7 +616,7 @@ Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer	character_set_clie
 select * from information_schema.triggers;
 TRIGGER_CATALOG	TRIGGER_SCHEMA	TRIGGER_NAME	EVENT_MANIPULATION	EVENT_OBJECT_CATALOG	EVENT_OBJECT_SCHEMA	EVENT_OBJECT_TABLE	ACTION_ORDER	ACTION_CONDITION	ACTION_STATEMENT	ACTION_ORIENTATION	ACTION_TIMING	ACTION_REFERENCE_OLD_TABLE	ACTION_REFERENCE_NEW_TABLE	ACTION_REFERENCE_OLD_ROW	ACTION_REFERENCE_NEW_ROW	CREATED	SQL_MODE	DEFINER	CHARACTER_SET_CLIENT	COLLATION_CONNECTION	DATABASE_COLLATION
 drop trigger trg1_1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -636,7 +636,7 @@ current_user
 test_yesprivs@localhost
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -672,11 +672,11 @@ set new.f1 = 'trig 1_2-yes';
 create trigger no_priv_db.trg1_9 before insert on no_priv_db.t1
 for each row
 set new.f1 = 'trig 1_9-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 use no_priv_db;
 create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 create trigger priv_db.trg1_9 before UPDATE on priv_db.t1
 for each row
 set new.f1 = 'trig 1_9-yes';
@@ -700,7 +700,7 @@ select f1 from t1 order by f1;
 f1
 insert-yes
 drop trigger priv_db.trg1_9;
-ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_noprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -709,7 +709,7 @@ drop trigger priv_db.trg1_9;
 revoke TRIGGER on priv_db.* from test_yesprivs@localhost;
 use priv_db;
 insert into t1 (f1) values ('insert-yes');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 insert-yes
@@ -729,7 +729,7 @@ test_yesprivs@localhost
 use no_priv_db;
 create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `no_priv_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -844,7 +844,7 @@ set new.f1 = 'trig 2_1-yes';
 use priv2_db;
 create trigger trg1_1 before INSERT  on t1 for each row
 set new.f1 = 'trig1_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv2_db`.`t1`
 connection no_privs;
 select current_user;
 current_user
@@ -919,7 +919,7 @@ test_yesprivs@localhost
 use priv1_db;
 create trigger trg1_1 before INSERT on t1 for each row
 set new.f1 = 'trig 1_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -946,7 +946,7 @@ create trigger trg1_2 before INSERT  on t1 for each row
 set new.f1 = 'trig 1_2-yes';
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-no';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
 connection no_privs;
 select current_user;
 current_user
@@ -987,7 +987,7 @@ current_user
 test_yesprivs@localhost
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv1_db`.`t2`
 use priv1_db;
 create trigger trg2_1 before INSERT  on t2 for each row
 set new.f1 = 'trig 2_1-yes';
@@ -1111,7 +1111,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1123,7 +1123,7 @@ current_user
 test_useprivs@localhost
 prepare ins1 from 'insert into t1 (f1) values (''insert5-no'')';
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1174,7 +1174,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1186,7 +1186,7 @@ select current_user;
 current_user
 test_useprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1241,7 +1241,7 @@ select current_user;
 current_user
 test_yesprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1256,7 +1256,7 @@ select current_user;
 current_user
 test_useprivs@localhost
 execute ins1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1324,11 +1324,11 @@ current_user
 test_yesprivs@localhost
 use priv_db;
 insert into t1 (f1) values ('insert-no');
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f1 from t1 order by f1;
 f1
 drop trigger trg1_0;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 connection default;
 select current_user;
 current_user
@@ -1577,12 +1577,12 @@ update t1 set f1 = 'update6_no'
                 where f1 like '%insert%';
 update t2 set f1 = 'update6_no'
                 where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 update t1 set f1 = 'update7_no'
                 where f1 like '%insert%';
 update t2 set f1 = 'update7_no'
                 where f1 like '%insert%';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't2'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t2`
 select f1 from t1 order by f1;
 f1
 trig 1_1-yes
@@ -1608,7 +1608,7 @@ test_noprivs@localhost
 update t1 set   f1 = 'update8-no',
 f2 = 'update8-no'
                 where f2 like '%yes';
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select * from t1 order by f1,f2,f3;
 f1	f2	f3
 trig 1_1-yes	NULL	NULL
@@ -1682,7 +1682,7 @@ current_user
 test_noprivs@localhost
 use priv_db;
 update t1 set f3= f3+1;
-ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table `priv_db`.`t1`
 select f3 from t1 order by f3;
 f3
 NULL
diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result
index 082ff5c99c6..efeb63ae616 100644
--- a/mysql-test/suite/funcs_1/r/storedproc.result
+++ b/mysql-test/suite/funcs_1/r/storedproc.result
@@ -1849,7 +1849,7 @@ connection u_1;
 user_1@localhost	db_storedproc
 USE db_storedproc;
 CALL sp11();
-ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'user_1'@'localhost' for table `mysql`.`t1`
 commit work;
 disconnect u_1;
 connection default;
diff --git a/mysql-test/suite/galera/r/galera_roles.result b/mysql-test/suite/galera/r/galera_roles.result
index 35487185db2..19bc9be62b0 100644
--- a/mysql-test/suite/galera/r/galera_roles.result
+++ b/mysql-test/suite/galera/r/galera_roles.result
@@ -33,7 +33,7 @@ GRANT USAGE ON *.* TO `foo`@`localhost`
 FLUSH TABLES;
 ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation
 SELECT * FROM mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 SHOW TABLES FROM test1;
 ERROR 42000: Access denied for user 'foo'@'localhost' to database 'test1'
 SET ROLE role1;
@@ -51,7 +51,7 @@ a	b
 1	2
 3	4
 SELECT * FROM test1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t2`
 SELECT a FROM test1.t2;
 a
 5
@@ -69,7 +69,7 @@ GRANT USAGE ON *.* TO `foo`@`localhost`
 FLUSH TABLES;
 ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation
 SELECT * FROM mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 SHOW TABLES FROM test1;
 ERROR 42000: Access denied for user 'foo'@'localhost' to database 'test1'
 SET ROLE role1;
@@ -87,7 +87,7 @@ a	b
 1	2
 3	4
 SELECT * FROM test1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t2`
 SELECT a FROM test1.t2;
 a
 5
@@ -124,11 +124,11 @@ DROP ROLE role1;
 connection foo_node_1;
 FLUSH TABLES;
 SELECT * FROM mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 SELECT * FROM test1.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t1`
 SELECT a FROM test1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t2`
 SHOW GRANTS;
 Grants for foo@localhost
 GRANT USAGE ON *.* TO `foo`@`localhost`
@@ -146,11 +146,11 @@ role1
 connection foo_node_2;
 FLUSH TABLES;
 SELECT * FROM mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 SELECT * FROM test1.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t1`
 SELECT a FROM test1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `test1`.`t2`
 SHOW GRANTS;
 Grants for foo@localhost
 GRANT USAGE ON *.* TO `foo`@`localhost`
diff --git a/mysql-test/suite/galera/r/rename.result b/mysql-test/suite/galera/r/rename.result
index 3ad715fa38c..c4a70a61159 100644
--- a/mysql-test/suite/galera/r/rename.result
+++ b/mysql-test/suite/galera/r/rename.result
@@ -23,7 +23,7 @@ i
 1
 # Following RENAME should not replicate to other node.
 RENAME TABLE t1 TO t2;
-ERROR 42000: DROP, ALTER command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: DROP, ALTER command denied to user 'foo'@'localhost' for table `test`.`t1`
 # On node 2
 connection node_2;
 USE test;
diff --git a/mysql-test/suite/gcol/t/virtual_index_drop.test b/mysql-test/suite/gcol/t/virtual_index_drop.test
index e1ec43f75e5..0fe4986f2c1 100644
--- a/mysql-test/suite/gcol/t/virtual_index_drop.test
+++ b/mysql-test/suite/gcol/t/virtual_index_drop.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 
 --echo #
 --echo # MDEV-24971 InnoDB access freed virtual column
diff --git a/mysql-test/suite/innodb/r/innodb-table-online.result b/mysql-test/suite/innodb/r/innodb-table-online.result
index 46e8488b9e4..b4e347b2600 100644
--- a/mysql-test/suite/innodb/r/innodb-table-online.result
+++ b/mysql-test/suite/innodb/r/innodb-table-online.result
@@ -433,13 +433,29 @@ INSERT INTO t1 VALUES(1, repeat('a', 10000));
 ROLLBACK;
 SET DEBUG_SYNC = 'now SIGNAL ins';
 connection con1;
-disconnect con1;
 connection default;
 SELECT * FROM t1;
 a	b
 0	NULL
 DROP TABLE t1;
 SET DEBUG_SYNC = 'RESET';
+#
+# MDEV-29600 Memory leak in row_log_table_apply_update()
+#
+CREATE TABLE t1 (pk INT PRIMARY KEY, f TEXT) ENGINE=InnoDB;
+INSERT INTO t1 SET pk=1;
+connection con1;
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL created WAIT_FOR updated';
+ALTER TABLE t1 FORCE;
+connection default;
+SET DEBUG_SYNC = 'now WAIT_FOR created';
+UPDATE t1 SET f = REPEAT('a', 20000);
+SET DEBUG_SYNC = 'now SIGNAL updated';
+connection con1;
+disconnect con1;
+connection default;
+DROP TABLE t1;
+SET DEBUG_SYNC = 'RESET';
 SET GLOBAL innodb_file_per_table = @global_innodb_file_per_table_orig;
 SET GLOBAL innodb_monitor_enable  = default;
 SET GLOBAL innodb_monitor_disable = default;
diff --git a/mysql-test/suite/innodb/r/log_file_name_debug.result b/mysql-test/suite/innodb/r/log_file_name_debug.result
index cb2ee68fc98..e5c1def8f8e 100644
--- a/mysql-test/suite/innodb/r/log_file_name_debug.result
+++ b/mysql-test/suite/innodb/r/log_file_name_debug.result
@@ -9,10 +9,9 @@ CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
 SELECT * FROM t1;
 ERROR 42000: Unknown storage engine 'InnoDB'
 FOUND 1 /InnoDB: Tablespace 4294967280 was not found at .*, but there were no modifications either/ in mysqld.1.err
-# restart: --debug=d,innodb_log_abort_3,ib_log --innodb-log-file-size=4194304
+# restart: --debug=d,innodb_log_abort_3 --innodb-log-file-size=4194304
 SELECT * FROM t1;
 ERROR 42000: Unknown storage engine 'InnoDB'
-FOUND 1 /ib_log: FILE_CHECKPOINT.* written/ in mysqld.1.err
 # restart
 # restart
 DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/alter_dml_apply.test b/mysql-test/suite/innodb/t/alter_dml_apply.test
index 4d6fd418691..01bfe458f1a 100644
--- a/mysql-test/suite/innodb/t/alter_dml_apply.test
+++ b/mysql-test/suite/innodb/t/alter_dml_apply.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 --source include/have_sequence.inc
 
 CREATE TABLE t1(f1 INT NOT NULL, f2 INT NOT NULL,
diff --git a/mysql-test/suite/innodb/t/alter_mdl_timeout.test b/mysql-test/suite/innodb/t/alter_mdl_timeout.test
index ff77921b2d2..6d916a3f23b 100644
--- a/mysql-test/suite/innodb/t/alter_mdl_timeout.test
+++ b/mysql-test/suite/innodb/t/alter_mdl_timeout.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 
 create table t1(f1 char(10), f2 char(10) not null, f3 int not null,
                 f4 int not null, primary key(f3))engine=innodb;
diff --git a/mysql-test/suite/innodb/t/autoinc_debug.test b/mysql-test/suite/innodb/t/autoinc_debug.test
index 485439f9250..7722b848c74 100644
--- a/mysql-test/suite/innodb/t/autoinc_debug.test
+++ b/mysql-test/suite/innodb/t/autoinc_debug.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 --source include/not_embedded.inc
 
 # Two parallel connection with autoinc column after restart.
diff --git a/mysql-test/suite/innodb/t/blob-crash.test b/mysql-test/suite/innodb/t/blob-crash.test
index 5d529059742..77787a34745 100644
--- a/mysql-test/suite/innodb/t/blob-crash.test
+++ b/mysql-test/suite/innodb/t/blob-crash.test
@@ -1,7 +1,8 @@
---source include/maybe_debug.inc
 --source include/innodb_page_size_small.inc
 --source include/no_valgrind_without_big.inc
 
+let $have_debug_sync=`select count(*) = 1 from information_schema.session_variables where variable_name = 'debug_sync' and variable_value like 'on %'`;
+
 --echo #
 --echo # Bug #16963396 INNODB: USE OF LARGE EXTERNALLY-STORED FIELDS MAKES
 --echo # CRASH RECOVERY LOSE DATA
@@ -95,7 +96,7 @@ select f1, right(f2, 20), right(f3, 20) from t2;
 update t2 set f3 = '&';
 select f1, right(f2, 20), right(f3, 20) from t2;
 
-if ($have_debug) {
+if ($have_debug_sync) {
 --disable_query_log
 set DEBUG_SYNC='blob_rollback_middle SIGNAL stuck WAIT_FOR ever';
 send ROLLBACK;
@@ -103,7 +104,7 @@ send ROLLBACK;
 }
 
 connection default;
-if ($have_debug) {
+if ($have_debug_sync) {
 --disable_query_log
 SET DEBUG_SYNC = 'now WAIT_FOR stuck';
 --enable_query_log
diff --git a/mysql-test/suite/innodb/t/innodb-table-online.test b/mysql-test/suite/innodb/t/innodb-table-online.test
index 03f4b58ab73..170ba5072f5 100644
--- a/mysql-test/suite/innodb/t/innodb-table-online.test
+++ b/mysql-test/suite/innodb/t/innodb-table-online.test
@@ -396,13 +396,36 @@ SET DEBUG_SYNC = 'now SIGNAL ins';
 
 connection con1;
 reap;
-disconnect con1;
 
 connection default;
 SELECT * FROM t1;
 DROP TABLE t1;
 SET DEBUG_SYNC = 'RESET';
 
+--echo #
+--echo # MDEV-29600 Memory leak in row_log_table_apply_update()
+--echo #
+
+CREATE TABLE t1 (pk INT PRIMARY KEY, f TEXT) ENGINE=InnoDB;
+INSERT INTO t1 SET pk=1;
+
+connection con1;
+SET DEBUG_SYNC = 'row_log_table_apply1_before SIGNAL created WAIT_FOR updated';
+send ALTER TABLE t1 FORCE;
+
+connection default;
+SET DEBUG_SYNC = 'now WAIT_FOR created';
+UPDATE t1 SET f = REPEAT('a', 20000);
+SET DEBUG_SYNC = 'now SIGNAL updated';
+
+connection con1;
+reap;
+disconnect con1;
+
+connection default;
+DROP TABLE t1;
+SET DEBUG_SYNC = 'RESET';
+
 # Check that all connections opened by test cases in this file are really
 # gone so execution of other tests won't be affected by their presence.
 --source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/innodb/t/log_file_name_debug.test b/mysql-test/suite/innodb/t/log_file_name_debug.test
index 239606b121b..9e3a7f8a83b 100644
--- a/mysql-test/suite/innodb/t/log_file_name_debug.test
+++ b/mysql-test/suite/innodb/t/log_file_name_debug.test
@@ -36,12 +36,10 @@ SELECT * FROM t1;
 --let SEARCH_PATTERN = InnoDB: Tablespace 4294967280 was not found at .*, but there were no modifications either
 --source include/search_pattern_in_file.inc
 
---let $restart_parameters= --debug=d,innodb_log_abort_3,ib_log $resize
+--let $restart_parameters= --debug=d,innodb_log_abort_3 $resize
 --source include/restart_mysqld.inc
 --error ER_UNKNOWN_STORAGE_ENGINE
 SELECT * FROM t1;
---let SEARCH_PATTERN= ib_log: FILE_CHECKPOINT.* written
---source include/search_pattern_in_file.inc
 
 --let $restart_parameters=
 --source include/restart_mysqld.inc
diff --git a/mysql-test/suite/innodb/t/online_table_rebuild.test b/mysql-test/suite/innodb/t/online_table_rebuild.test
index 94bac2f949c..1d34738703c 100644
--- a/mysql-test/suite/innodb/t/online_table_rebuild.test
+++ b/mysql-test/suite/innodb/t/online_table_rebuild.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 --source include/have_sequence.inc
 
 CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(200), f3 CHAR(200))ENGINE=InnoDB;
diff --git a/mysql-test/suite/mariabackup/alter_copy_excluded.test b/mysql-test/suite/mariabackup/alter_copy_excluded.test
index 195aa09b5df..599fb46bdd5 100644
--- a/mysql-test/suite/mariabackup/alter_copy_excluded.test
+++ b/mysql-test/suite/mariabackup/alter_copy_excluded.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 
 # The test demonstrates that intermediate tables (ALTER TABLE...ALGORITHM=COPY)
 # will not be included in a backup.
diff --git a/mysql-test/suite/mariabackup/alter_copy_race.test b/mysql-test/suite/mariabackup/alter_copy_race.test
index 1ee69168115..553643bf667 100644
--- a/mysql-test/suite/mariabackup/alter_copy_race.test
+++ b/mysql-test/suite/mariabackup/alter_copy_race.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 
 # The test demonstrates that intermediate tables (ALTER TABLE...ALGORITHM=COPY)
 # are not always properly locked, e.g., can be dropped after
diff --git a/mysql-test/suite/mariabackup/big_innodb_log.test b/mysql-test/suite/mariabackup/big_innodb_log.test
index 247e7179c42..23ac59c13eb 100644
--- a/mysql-test/suite/mariabackup/big_innodb_log.test
+++ b/mysql-test/suite/mariabackup/big_innodb_log.test
@@ -7,7 +7,7 @@
 --source include/have_debug.inc
 
 --let MYSQLD_DATADIR= `select @@datadir`
-let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --debug-dbug=+d,innodb_small_log_block_no_limit;
+let $MYSQLD_BOOTSTRAP_CMD= $MYSQLD_BOOTSTRAP_CMD --datadir=$MYSQLD_DATADIR --tmpdir=$MYSQL_TMP_DIR --debug-dbug=+d,innodb_small_log_block_no_limit;
 
 --source include/kill_mysqld.inc
 --rmdir $MYSQLD_DATADIR
diff --git a/mysql-test/suite/parts/r/alter_table.result b/mysql-test/suite/parts/r/alter_table.result
index 53eb482d85d..b887cea36f0 100644
--- a/mysql-test/suite/parts/r/alter_table.result
+++ b/mysql-test/suite/parts/r/alter_table.result
@@ -296,7 +296,7 @@ Grants for alan@%
 GRANT USAGE ON *.* TO `alan`@`%`
 GRANT INSERT, CREATE, DROP ON `test`.* TO `alan`@`%`
 alter table t1 convert partition p1 to table tp1;
-ERROR 42000: ALTER command denied to user 'alan'@'localhost' for table 't1'
+ERROR 42000: ALTER command denied to user 'alan'@'localhost' for table `test`.`t1`
 connection default;
 revoke all on test.* from alan;
 grant create, insert, alter on test.* to alan;
@@ -307,7 +307,7 @@ Grants for alan@%
 GRANT USAGE ON *.* TO `alan`@`%`
 GRANT INSERT, CREATE, ALTER ON `test`.* TO `alan`@`%`
 alter table t1 convert partition p1 to table tp1;
-ERROR 42000: DROP command denied to user 'alan'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'alan'@'localhost' for table `test`.`t1`
 connection default;
 revoke all on test.* from alan;
 grant create, drop, alter on test.* to alan;
@@ -318,7 +318,7 @@ Grants for alan@%
 GRANT USAGE ON *.* TO `alan`@`%`
 GRANT CREATE, DROP, ALTER ON `test`.* TO `alan`@`%`
 alter table t1 convert partition p1 to table tp1;
-ERROR 42000: INSERT command denied to user 'alan'@'localhost' for table 'tp1'
+ERROR 42000: INSERT command denied to user 'alan'@'localhost' for table `test`.`tp1`
 connection default;
 revoke all on test.* from alan;
 grant insert, drop, alter on test.* to alan;
@@ -329,7 +329,7 @@ Grants for alan@%
 GRANT USAGE ON *.* TO `alan`@`%`
 GRANT INSERT, DROP, ALTER ON `test`.* TO `alan`@`%`
 alter table t1 convert partition p1 to table tp1;
-ERROR 42000: CREATE command denied to user 'alan'@'localhost' for table 'tp1'
+ERROR 42000: CREATE command denied to user 'alan'@'localhost' for table `test`.`tp1`
 connection default;
 grant create, insert, drop, alter on test.* to alan;
 connection alan;
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result
index 2e31fc57dd4..aa35364b811 100644
--- a/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result
@@ -13,7 +13,7 @@ Grants for test1@localhost
 GRANT USAGE ON *.* TO `test1`@`localhost`
 GRANT SELECT, INSERT, CREATE, DROP ON `test`.* TO `test1`@`localhost`
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table `test`.`tp`
 disconnect test1;
 connect  test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 USE test;
@@ -83,7 +83,7 @@ Grants for test2@localhost
 GRANT USAGE ON *.* TO `test2`@`localhost`
 GRANT SELECT, INSERT, UPDATE, CREATE, DROP ON `test`.* TO `test2`@`localhost`
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp`
 SELECT * FROM tp WHERE a BETWEEN 0 AND 10;
 a	b
 2	Two
@@ -91,11 +91,11 @@ a	b
 6	Six
 8	Eight
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp`
 ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp`
 ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp`
 connection default;
 disconnect test2;
 DROP TABLE IF EXISTS t_10;
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result
index 2e31fc57dd4..aa35364b811 100644
--- a/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result
@@ -13,7 +13,7 @@ Grants for test1@localhost
 GRANT USAGE ON *.* TO `test1`@`localhost`
 GRANT SELECT, INSERT, CREATE, DROP ON `test`.* TO `test1`@`localhost`
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test1'@'localhost' for table `test`.`tp`
 disconnect test1;
 connect  test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 USE test;
@@ -83,7 +83,7 @@ Grants for test2@localhost
 GRANT USAGE ON *.* TO `test2`@`localhost`
 GRANT SELECT, INSERT, UPDATE, CREATE, DROP ON `test`.* TO `test2`@`localhost`
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp`
 SELECT * FROM tp WHERE a BETWEEN 0 AND 10;
 a	b
 2	Two
@@ -91,11 +91,11 @@ a	b
 6	Six
 8	Eight
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tp`
 ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp`
 ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
-ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table 'tsp'
+ERROR 42000: ALTER command denied to user 'test2'@'localhost' for table `test`.`tsp`
 connection default;
 disconnect test2;
 DROP TABLE IF EXISTS t_10;
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_6.result b/mysql-test/suite/parts/r/partition_exch_qa_6.result
index 880886b4fac..7917765c9dd 100644
--- a/mysql-test/suite/parts/r/partition_exch_qa_6.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_6.result
@@ -117,7 +117,7 @@ Grants for test2@localhost
 GRANT USAGE ON *.* TO `test2`@`localhost`
 GRANT SELECT, UPDATE, CREATE, DROP, ALTER ON `test`.* TO `test2`@`localhost`
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `test`.`tp`
 disconnect test2;
 connection default;
 GRANT INSERT ON test.* TO test2@localhost;
@@ -129,7 +129,7 @@ Grants for test2@localhost
 GRANT USAGE ON *.* TO `test2`@`localhost`
 GRANT SELECT, INSERT, UPDATE, DROP, ALTER ON `test`.* TO `test2`@`localhost`
 ALTER TABLE tsp EXCHANGE PARTITION sp00 WITH TABLE tsp_00;
-ERROR 42000: CREATE command denied to user 'test2'@'localhost' for table 'tsp'
+ERROR 42000: CREATE command denied to user 'test2'@'localhost' for table `test`.`tsp`
 disconnect test2;
 connection default;
 GRANT CREATE ON test.* TO test2@localhost;
@@ -140,7 +140,7 @@ Grants for test2@localhost
 GRANT USAGE ON *.* TO `test2`@`localhost`
 GRANT SELECT, INSERT, UPDATE, CREATE, ALTER ON `test`.* TO `test2`@`localhost`
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: DROP command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: DROP command denied to user 'test2'@'localhost' for table `test`.`tp`
 disconnect test2;
 connection default;
 DROP TABLE IF EXISTS t_10;
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result b/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result
index 2fd45be9261..842c93ac403 100644
--- a/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result
@@ -62,9 +62,9 @@ connection default;
 REVOKE INSERT ON testdb.* FROM test2@localhost;
 connect  test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10;
-ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 't_10'
+ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`t_10`
 ALTER TABLE testdb.tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`tp`
 disconnect test2;
 connection default;
 DROP TABLE IF EXISTS t_10;
diff --git a/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result b/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result
index 2fd45be9261..842c93ac403 100644
--- a/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result
+++ b/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result
@@ -62,9 +62,9 @@ connection default;
 REVOKE INSERT ON testdb.* FROM test2@localhost;
 connect  test2,localhost,test2,,test,$MASTER_MYPORT,$MASTER_MYSOCK;
 ALTER TABLE tp EXCHANGE PARTITION p0 WITH TABLE testdb.t_10;
-ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 't_10'
+ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`t_10`
 ALTER TABLE testdb.tp EXCHANGE PARTITION p0 WITH TABLE t_10;
-ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table 'tp'
+ERROR 42000: INSERT command denied to user 'test2'@'localhost' for table `testdb`.`tp`
 disconnect test2;
 connection default;
 DROP TABLE IF EXISTS t_10;
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
diff --git a/mysql-test/suite/roles/definer.result b/mysql-test/suite/roles/definer.result
index 49ff21845eb..8b5e36d8b3c 100644
--- a/mysql-test/suite/roles/definer.result
+++ b/mysql-test/suite/roles/definer.result
@@ -50,9 +50,9 @@ a+b	c	current_role()
 select * from test.v3;
 ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
 create definer=role4 view test.v4 as select a+b,c from t1;
-ERROR 42000: ANY command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: ANY command denied to user 'foo'@'localhost' for table `mysqltest1`.`t1`
 select * from t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t1`
 set role role4;
 select * from t1;
 a	b	c
@@ -113,7 +113,7 @@ tr1	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE
 insert t1 values (111, 222, 333)	latin1	latin1_swedish_ci	latin1_swedish_ci	#
 set role none;
 insert t2 values (11,22,33);
-ERROR 42000: INSERT command denied to user ''@'' for table 't1'
+ERROR 42000: INSERT command denied to user ''@'' for table `mysqltest1`.`t1`
 select * from t1;
 a	b	c
 1	10	100
@@ -179,7 +179,7 @@ pr1	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE
 insert t1 values (111, 222, 333)	latin1	latin1_swedish_ci	latin1_swedish_ci
 set role none;
 call pr1();
-ERROR 42000: INSERT command denied to user ''@'' for table 't1'
+ERROR 42000: INSERT command denied to user ''@'' for table `mysqltest1`.`t1`
 select * from t1;
 a	b	c
 1	10	100
diff --git a/mysql-test/suite/roles/recursive.result b/mysql-test/suite/roles/recursive.result
index 0d45a0e03d0..05f28745f02 100644
--- a/mysql-test/suite/roles/recursive.result
+++ b/mysql-test/suite/roles/recursive.result
@@ -49,7 +49,7 @@ show status like 'debug%';
 Variable_name	Value
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role role10;
 select count(*) from mysql.roles_mapping;
 count(*)
@@ -99,7 +99,7 @@ count(*)
 set role none;
 set role role10;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role none;
 connection default;
 grant select on mysql.* to role1;
@@ -107,7 +107,7 @@ show status like 'debug%';
 Variable_name	Value
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role role10;
 select count(*) from mysql.roles_mapping;
 count(*)
@@ -142,7 +142,7 @@ show status like 'debug%';
 Variable_name	Value
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role none;
 connection default;
 grant select on mysql.roles_mapping to role1;
@@ -150,7 +150,7 @@ show status like 'debug%';
 Variable_name	Value
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role role10;
 select count(*) from mysql.roles_mapping;
 count(*)
@@ -185,7 +185,7 @@ show status like 'debug%';
 Variable_name	Value
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role none;
 connection default;
 grant select(User) on mysql.roles_mapping to role1;
@@ -193,7 +193,7 @@ show status like 'debug%';
 Variable_name	Value
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role role10;
 select count(concat(User,Host,Role)) from mysql.roles_mapping;
 ERROR 42000: SELECT command denied to user 'foo'@'localhost' for column 'Host' in table 'roles_mapping'
@@ -275,7 +275,7 @@ show status like 'debug%';
 Variable_name	Value
 connection foo;
 select count(concat(Host)) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role none;
 connection default;
 create procedure pr1() select "pr1";
diff --git a/mysql-test/suite/roles/recursive_dbug.result b/mysql-test/suite/roles/recursive_dbug.result
index 6a86df655e7..55bbad51c09 100644
--- a/mysql-test/suite/roles/recursive_dbug.result
+++ b/mysql-test/suite/roles/recursive_dbug.result
@@ -63,7 +63,7 @@ Debug_role_merges_column	0
 Debug_role_merges_routine	0
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role role10;
 select count(*) from mysql.roles_mapping;
 count(*)
@@ -118,7 +118,7 @@ count(*)
 set role none;
 set role role10;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role none;
 connection default;
 grant select on mysql.* to role1;
@@ -131,7 +131,7 @@ Debug_role_merges_column	0
 Debug_role_merges_routine	0
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role role10;
 select count(*) from mysql.roles_mapping;
 count(*)
@@ -171,7 +171,7 @@ Debug_role_merges_column	0
 Debug_role_merges_routine	0
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role none;
 connection default;
 grant select on mysql.roles_mapping to role1;
@@ -184,7 +184,7 @@ Debug_role_merges_column	0
 Debug_role_merges_routine	0
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role role10;
 select count(*) from mysql.roles_mapping;
 count(*)
@@ -224,7 +224,7 @@ Debug_role_merges_column	0
 Debug_role_merges_routine	0
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role none;
 connection default;
 grant select(User) on mysql.roles_mapping to role1;
@@ -237,7 +237,7 @@ Debug_role_merges_column	9
 Debug_role_merges_routine	0
 connection foo;
 select count(*) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role role10;
 select count(concat(User,Host,Role)) from mysql.roles_mapping;
 ERROR 42000: SELECT command denied to user 'foo'@'localhost' for column 'Host' in table 'roles_mapping'
@@ -334,7 +334,7 @@ Debug_role_merges_column	30
 Debug_role_merges_routine	0
 connection foo;
 select count(concat(Host)) from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 set role none;
 connection default;
 create procedure pr1() select "pr1";
diff --git a/mysql-test/suite/roles/role_case_sensitive-10744.result b/mysql-test/suite/roles/role_case_sensitive-10744.result
index 2f27db1525a..8cb45b13ae0 100644
--- a/mysql-test/suite/roles/role_case_sensitive-10744.result
+++ b/mysql-test/suite/roles/role_case_sensitive-10744.result
@@ -44,7 +44,7 @@ show tables from secret_db;
 Tables_in_secret_db
 t1
 select * from secret_db.t1;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `secret_db`.`t1`
 insert into secret_db.t1 values ("|-|4><");
 set role test_role;
 select * from secret_db.t1 order by secret;
@@ -52,7 +52,7 @@ secret
 Some Secret P4ssw0rd
 |-|4><
 insert into secret_db.t1 values ("|_33T|-|4><");
-ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `secret_db`.`t1`
 connection default;
 drop role test_ROLE;
 drop role test_role;
diff --git a/mysql-test/suite/roles/role_grant_propagate-29458.result b/mysql-test/suite/roles/role_grant_propagate-29458.result
index 28aa053f38a..88d3c0e38fb 100644
--- a/mysql-test/suite/roles/role_grant_propagate-29458.result
+++ b/mysql-test/suite/roles/role_grant_propagate-29458.result
@@ -81,7 +81,7 @@ grant alter routine on procedure some_db.p1 to r_active_proc;
 grant alter routine on function some_db.f1 to r_active_func;
 connect  con1, localhost, foo,,;
 select * from some_db.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `some_db`.`t1`
 #
 # Before MDEV-29458 fix, all these commands would return
 # ER_TABLEACCESS_DENIED_ERROR
diff --git a/mysql-test/suite/roles/roles_tables_priv-29465.result b/mysql-test/suite/roles/roles_tables_priv-29465.result
index 1e0721956b4..85ab188145e 100644
--- a/mysql-test/suite/roles/roles_tables_priv-29465.result
+++ b/mysql-test/suite/roles/roles_tables_priv-29465.result
@@ -18,7 +18,7 @@ localhost	mysql	mariadb.sys	global_priv	root@localhost	0000-00-00 00:00:00	Selec
 	some_db	r_select_column	t1	root@localhost	0000-00-00 00:00:00		Select
 connect  con1, localhost, foo,,;
 insert into some_db.t1(a) values (1);
-ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table `some_db`.`t1`
 set role r_active_column;
 insert into some_db.t1(a) values (1);
 disconnect con1;
@@ -26,10 +26,10 @@ connection default;
 revoke insert(a) on some_db.t1 from r_active_column;
 connect  con1, localhost, foo,,;
 insert into some_db.t1(a) values (1);
-ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table `some_db`.`t1`
 set role r_active_column;
 insert into some_db.t1(a) values (1);
-ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table `some_db`.`t1`
 disconnect con1;
 connection default;
 drop role r_select_column;
diff --git a/mysql-test/suite/roles/set_and_drop.result b/mysql-test/suite/roles/set_and_drop.result
index 87ccad2b447..e52a82bd77b 100644
--- a/mysql-test/suite/roles/set_and_drop.result
+++ b/mysql-test/suite/roles/set_and_drop.result
@@ -18,7 +18,7 @@ connect  foo,localhost,foo;
 flush tables;
 ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 show tables from mysqltest1;
 ERROR 42000: Access denied for user 'foo'@'localhost' to database 'mysqltest1'
 set role role1;
@@ -38,7 +38,7 @@ a	b
 1	2
 3	4
 select * from mysqltest1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t2`
 select a from mysqltest1.t2;
 a
 5
@@ -64,11 +64,11 @@ ROLE_NAME
 role1
 flush tables;
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 select * from mysqltest1.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t1`
 select a from mysqltest1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t2`
 set role none;
 connection default;
 grant reload on *.* to role1;
@@ -92,7 +92,7 @@ a	b
 1	2
 3	4
 select * from mysqltest1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t2`
 select a from mysqltest1.t2;
 a
 5
@@ -105,11 +105,11 @@ drop role role1;
 connection foo;
 flush tables;
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysql`.`roles_mapping`
 select * from mysqltest1.t1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t1`
 select a from mysqltest1.t2;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `mysqltest1`.`t2`
 show grants;
 Grants for foo@localhost
 GRANT USAGE ON *.* TO `foo`@`localhost`
diff --git a/mysql-test/suite/roles/set_default_role_clear.result b/mysql-test/suite/roles/set_default_role_clear.result
index d8508f5d0d6..8a3ae908435 100644
--- a/mysql-test/suite/roles/set_default_role_clear.result
+++ b/mysql-test/suite/roles/set_default_role_clear.result
@@ -8,7 +8,7 @@ GRANT `test_role` TO `test_user`@`localhost`
 GRANT USAGE ON *.* TO `test_user`@`localhost`
 set default role test_role;
 select user, host, default_role from mysql.user;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 select user, host, default_role from mysql.user where user='test_user';
 User	Host	default_role
 test_user	localhost	test_role
@@ -31,6 +31,6 @@ select user, host, default_role from mysql.user where user='test_user';
 User	Host	default_role
 test_user	localhost	
 select user, host, default_role from mysql.user;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 drop role test_role;
 drop user test_user@localhost;
diff --git a/mysql-test/suite/roles/set_default_role_for.result b/mysql-test/suite/roles/set_default_role_for.result
index 3ddf48eb416..57a1471126c 100644
--- a/mysql-test/suite/roles/set_default_role_for.result
+++ b/mysql-test/suite/roles/set_default_role_for.result
@@ -45,7 +45,7 @@ GRANT USAGE ON *.* TO `user_b`@`localhost`
 GRANT INSERT, UPDATE ON *.* TO `role_b`
 SET DEFAULT ROLE `role_b` FOR `user_b`@`localhost`
 select user, host, default_role from mysql.user where user like 'user_%';
-ERROR 42000: SELECT command denied to user 'user_b'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'user_b'@'localhost' for table `mysql`.`user`
 set default role NONE for user_a@localhost;
 show grants;
 Grants for user_a@localhost
@@ -53,7 +53,7 @@ GRANT `role_a` TO `user_a`@`localhost`
 GRANT USAGE ON *.* TO `user_a`@`localhost`
 GRANT INSERT, UPDATE ON *.* TO `role_b`
 select user, host, default_role from mysql.user where user like 'user_%';
-ERROR 42000: SELECT command denied to user 'user_a'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'user_a'@'localhost' for table `mysql`.`user`
 drop role role_a;
 drop role role_b;
 drop user user_a@localhost;
diff --git a/mysql-test/suite/roles/set_default_role_invalid.result b/mysql-test/suite/roles/set_default_role_invalid.result
index eb3924dc617..12e2c035a7d 100644
--- a/mysql-test/suite/roles/set_default_role_invalid.result
+++ b/mysql-test/suite/roles/set_default_role_invalid.result
@@ -8,14 +8,14 @@ Grants for test_user@localhost
 GRANT `test_role` TO `test_user`@`localhost`
 GRANT USAGE ON *.* TO `test_user`@`localhost`
 select user, host, default_role from mysql.user;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 set default role invalid_role;
 ERROR OP000: Invalid role specification `invalid_role`
 set default role not_granted_role;
 ERROR OP000: Invalid role specification `not_granted_role`
 set default role test_role;
 select user, host, default_role from mysql.user;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 select user, host, default_role from mysql.user where user='test_user';
 User	Host	default_role
 test_user	localhost	test_role
@@ -35,7 +35,7 @@ User	Host	default_role
 test_user	localhost	test_role
 revoke test_role from test_user@localhost;
 select user, host, default_role from mysql.user where user='test_user';
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 drop role test_role;
 drop role not_granted_role;
 drop user test_user@localhost;
diff --git a/mysql-test/suite/roles/set_default_role_new_connection.result b/mysql-test/suite/roles/set_default_role_new_connection.result
index 5c51b782ab7..95c712746db 100644
--- a/mysql-test/suite/roles/set_default_role_new_connection.result
+++ b/mysql-test/suite/roles/set_default_role_new_connection.result
@@ -8,10 +8,10 @@ Grants for test_user@localhost
 GRANT `test_role` TO `test_user`@`localhost`
 GRANT USAGE ON *.* TO `test_user`@`localhost`
 select user, host, default_role from mysql.user where user = 'test_user';
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 set default role test_role;
 select user, host, default_role from mysql.user where user = 'test_user';
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 disconnect c1;
 connection default;
 select user, host, default_role from mysql.user where user = 'test_user';
@@ -39,7 +39,7 @@ Grants for test_user@localhost
 GRANT `test_role` TO `test_user`@`localhost`
 GRANT USAGE ON *.* TO `test_user`@`localhost`
 select user, host, default_role from mysql.user where user = 'test_user';
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 disconnect c1;
 connection default;
 select user, host, default_role from mysql.user where user = 'test_user';
diff --git a/mysql-test/suite/roles/set_role-5232.result b/mysql-test/suite/roles/set_role-5232.result
index 31cb4b105ec..6158c95e5c0 100644
--- a/mysql-test/suite/roles/set_role-5232.result
+++ b/mysql-test/suite/roles/set_role-5232.result
@@ -8,7 +8,7 @@ select user(), current_user();
 user()	current_user()
 c@localhost	@localhost
 select user from mysql.user group by user;
-ERROR 42000: SELECT command denied to user ''@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user ''@'localhost' for table `mysql`.`user`
 set role r1;
 ERROR OP000: Invalid role specification `r1`
 disconnect c;
diff --git a/mysql-test/suite/roles/set_role-database-recursive.result b/mysql-test/suite/roles/set_role-database-recursive.result
index bc3914413a3..be31e645362 100644
--- a/mysql-test/suite/roles/set_role-database-recursive.result
+++ b/mysql-test/suite/roles/set_role-database-recursive.result
@@ -24,7 +24,7 @@ user	host
 grant select on mysql.* to test_role2;
 flush privileges;
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 select current_user(), current_role();
 current_user()	current_role()
 test_user@localhost	NULL
@@ -44,7 +44,7 @@ select current_user(), current_role();
 current_user()	current_role()
 test_user@localhost	NULL
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 set role test_role2;
 select current_user(), current_role();
 current_user()	current_role()
@@ -62,7 +62,7 @@ create role test_role4;
 grant test_role4 to test_role3;
 set role test_role1;
 delete from mysql.user where user='no such user';
-ERROR 42000: DELETE command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: DELETE command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 grant delete on mysql.* to test_role4;
 set role test_role1;
 delete from mysql.user where user='no such user';
diff --git a/mysql-test/suite/roles/set_role-database-simple.result b/mysql-test/suite/roles/set_role-database-simple.result
index a48f04985bb..969a7ab10fa 100644
--- a/mysql-test/suite/roles/set_role-database-simple.result
+++ b/mysql-test/suite/roles/set_role-database-simple.result
@@ -14,7 +14,7 @@ grant select on mysql.* to test_role1;
 grant insert, delete on mysql.roles_mapping to test_role1;
 grant reload on *.* to test_role1;
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 select current_user(), current_role();
 current_user()	current_role()
 test_user@localhost	NULL
@@ -27,7 +27,7 @@ Host	User	Role	Admin_option
 localhost	root	test_role1	Y
 localhost	test_user	test_role1	N
 insert into mysql.user (user, host) values ('Dummy', 'Dummy');
-ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 insert into mysql.roles_mapping values ('localhost', 'test_user', 'test_role2', 'N');
 delete from mysql.roles_mapping where Role='test_role2';
 use mysql;
@@ -38,13 +38,13 @@ test_user@localhost	NULL
 use mysql;
 ERROR 42000: Access denied for user 'test_user'@'localhost' to database 'mysql'
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 insert into mysql.user (user, host) values ('Dummy', 'Dummy');
-ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table 'user'
+ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `mysql`.`user`
 insert into mysql.roles_mapping values ('localhost', 'test_user', 'test_role2', 'N');
-ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 delete from mysql.roles_mapping where Role='test_role2';
-ERROR 42000: DELETE command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: DELETE command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 drop user 'test_user'@'localhost';
 revoke select on mysql.* from test_role1;
 revoke insert, delete on mysql.roles_mapping from test_role1;
diff --git a/mysql-test/suite/roles/set_role-multiple-role.result b/mysql-test/suite/roles/set_role-multiple-role.result
index 2ddd1e8a510..e4cb3b8542c 100644
--- a/mysql-test/suite/roles/set_role-multiple-role.result
+++ b/mysql-test/suite/roles/set_role-multiple-role.result
@@ -22,7 +22,7 @@ grant r_drp to test_user@localhost;
 grant r_rld to test_user@localhost;
 flush privileges;
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 show grants;
 Grants for test_user@localhost
 GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -83,7 +83,7 @@ GRANT `r_rld` TO `test_user`@`localhost`
 GRANT `r_sel` TO `test_user`@`localhost`
 GRANT `r_upd` TO `test_user`@`localhost`
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 insert into mysql.roles_mapping values ('', 'r_sel', 'r_rld', 'N');
 flush privileges;
 ERROR 42000: Access denied; you need (at least one of) the RELOAD privilege(s) for this operation
@@ -139,7 +139,7 @@ select current_user(), current_role();
 current_user()	current_role()
 test_user@localhost	r_sel
 insert into mysql.random_test_table values (1);
-ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table 'random_test_table'
+ERROR 42000: INSERT command denied to user 'test_user'@'localhost' for table `mysql`.`random_test_table`
 drop table mysql.random_test_table;
 delete from mysql.user where user like 'r\_%';
 delete from mysql.roles_mapping where Role like 'r\_%';
diff --git a/mysql-test/suite/roles/set_role-recursive.result b/mysql-test/suite/roles/set_role-recursive.result
index 102ee392581..f93a731bedb 100644
--- a/mysql-test/suite/roles/set_role-recursive.result
+++ b/mysql-test/suite/roles/set_role-recursive.result
@@ -23,7 +23,7 @@ select * from mysql.user where user like 'test_role2';
 Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	Create_tablespace_priv	Delete_history_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	authentication_string	password_expired	is_role	default_role	max_statement_time
 	test_role2		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0			N	Y		0.000000
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 show grants;
 Grants for test_user@localhost
 GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -61,7 +61,7 @@ Grants for test_user@localhost
 GRANT USAGE ON *.* TO `test_user`@`localhost`
 GRANT `test_role1` TO `test_user`@`localhost`
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 show grants;
 Grants for test_user@localhost
 GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -76,7 +76,7 @@ Grants for test_user@localhost
 GRANT USAGE ON *.* TO `test_user`@`localhost`
 GRANT `test_role1` TO `test_user`@`localhost`
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 show grants;
 Grants for test_user@localhost
 GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -111,7 +111,7 @@ Grants for test_user@localhost
 GRANT USAGE ON *.* TO `test_user`@`localhost`
 GRANT `test_role1` TO `test_user`@`localhost`
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 delete from mysql.user where user='test_role1';
 delete from mysql.user where user='test_role2';
 delete from mysql.roles_mapping;
diff --git a/mysql-test/suite/roles/set_role-simple.result b/mysql-test/suite/roles/set_role-simple.result
index 59e61d4836a..c603f727fd1 100644
--- a/mysql-test/suite/roles/set_role-simple.result
+++ b/mysql-test/suite/roles/set_role-simple.result
@@ -15,7 +15,7 @@ select * from mysql.user where user='test_role1';
 Host	User	Password	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Reload_priv	Shutdown_priv	Process_priv	File_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Show_db_priv	Super_priv	Create_tmp_table_priv	Lock_tables_priv	Execute_priv	Repl_slave_priv	Repl_client_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Create_user_priv	Event_priv	Trigger_priv	Create_tablespace_priv	Delete_history_priv	ssl_type	ssl_cipher	x509_issuer	x509_subject	max_questions	max_updates	max_connections	max_user_connections	plugin	authentication_string	password_expired	is_role	default_role	max_statement_time
 	test_role1		Y	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N	N					0	0	0	0			N	Y		0.000000
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 show grants;
 Grants for test_user@localhost
 GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -41,7 +41,7 @@ select current_user(), current_role();
 current_user()	current_role()
 test_user@localhost	NULL
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 delete from mysql.user where user='test_role1';
 delete from mysql.roles_mapping where Role='test_role1';
 flush privileges;
diff --git a/mysql-test/suite/roles/set_role-table-column-priv.result b/mysql-test/suite/roles/set_role-table-column-priv.result
index 4aaa0388170..e0e8732e7a5 100644
--- a/mysql-test/suite/roles/set_role-table-column-priv.result
+++ b/mysql-test/suite/roles/set_role-table-column-priv.result
@@ -17,7 +17,7 @@ localhost	root	test_role2	Y
 localhost	test_user	test_role1	N
 grant select (Role) on mysql.roles_mapping to test_role2;
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 show grants;
 Grants for test_user@localhost
 GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -59,7 +59,7 @@ select current_user(), current_role();
 current_user()	current_role()
 test_user@localhost	NULL
 select Role from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 drop user 'test_user'@'localhost';
 select * from mysql.tables_priv;
 Host	Db	User	Table_name	Grantor	Timestamp	Table_priv	Column_priv
diff --git a/mysql-test/suite/roles/set_role-table-simple.result b/mysql-test/suite/roles/set_role-table-simple.result
index f33df34d85e..3f1a68eeaa0 100644
--- a/mysql-test/suite/roles/set_role-table-simple.result
+++ b/mysql-test/suite/roles/set_role-table-simple.result
@@ -17,7 +17,7 @@ localhost	root	test_role2	Y
 localhost	test_user	test_role1	N
 grant select on mysql.roles_mapping to test_role2;
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 show grants;
 Grants for test_user@localhost
 GRANT USAGE ON *.* TO `test_user`@`localhost`
@@ -57,7 +57,7 @@ select current_user(), current_role();
 current_user()	current_role()
 test_user@localhost	NULL
 select * from mysql.roles_mapping;
-ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table 'roles_mapping'
+ERROR 42000: SELECT command denied to user 'test_user'@'localhost' for table `mysql`.`roles_mapping`
 drop user 'test_user'@'localhost';
 select * from mysql.tables_priv;
 Host	Db	User	Table_name	Grantor	Timestamp	Table_priv	Column_priv
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence.result
deleted file mode 100644
index aa9fb34ec02..00000000000
--- a/mysql-test/suite/rpl/r/rpl_row_img_sequence.result
+++ /dev/null
@@ -1,2290 +0,0 @@
-include/rpl_init.inc [topology=1->2->3]
-connection server_1;
-connection server_2;
-connection server_3;
-connection server_1;
-#
-# Test Case 1) binlog_row_image=MINIMAL should write only columns
-# 1 and 8 to the binary log
-#
-CON: 'server_1', IMG: 'MINIMAL', RESTART SLAVE: 'N'
-connection server_1;
-SET SESSION binlog_row_image= 'MINIMAL';
-SET GLOBAL binlog_row_image= 'MINIMAL';
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name	Value
-binlog_row_image	MINIMAL
-CON: 'server_2', IMG: 'MINIMAL', RESTART SLAVE: 'Y'
-connection server_2;
-SET SESSION binlog_row_image= 'MINIMAL';
-SET GLOBAL binlog_row_image= 'MINIMAL';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name	Value
-binlog_row_image	MINIMAL
-CON: 'server_3', IMG: 'MINIMAL', RESTART SLAVE: 'Y'
-connection server_3;
-SET SESSION binlog_row_image= 'MINIMAL';
-SET GLOBAL binlog_row_image= 'MINIMAL';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name	Value
-binlog_row_image	MINIMAL
-connection server_1;
-### engines: MyISAM, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-#
-# Test Case 2) binlog_row_image=NOBLOB should write all columns to the
-# binary log
-#
-CON: 'server_1', IMG: 'NOBLOB', RESTART SLAVE: 'N'
-connection server_1;
-SET SESSION binlog_row_image= 'NOBLOB';
-SET GLOBAL binlog_row_image= 'NOBLOB';
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name	Value
-binlog_row_image	NOBLOB
-CON: 'server_2', IMG: 'NOBLOB', RESTART SLAVE: 'Y'
-connection server_2;
-SET SESSION binlog_row_image= 'NOBLOB';
-SET GLOBAL binlog_row_image= 'NOBLOB';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name	Value
-binlog_row_image	NOBLOB
-CON: 'server_3', IMG: 'NOBLOB', RESTART SLAVE: 'Y'
-connection server_3;
-SET SESSION binlog_row_image= 'NOBLOB';
-SET GLOBAL binlog_row_image= 'NOBLOB';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name	Value
-binlog_row_image	NOBLOB
-connection server_3;
-### engines: MyISAM, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-#
-# Test Case 3) binlog_row_image=NOBLOB should write all columns to the
-# binary log
-#
-CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
-connection server_1;
-SET SESSION binlog_row_image= 'FULL';
-SET GLOBAL binlog_row_image= 'FULL';
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name	Value
-binlog_row_image	FULL
-CON: 'server_2', IMG: 'FULL', RESTART SLAVE: 'Y'
-connection server_2;
-SET SESSION binlog_row_image= 'FULL';
-SET GLOBAL binlog_row_image= 'FULL';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name	Value
-binlog_row_image	FULL
-CON: 'server_3', IMG: 'FULL', RESTART SLAVE: 'Y'
-connection server_3;
-SET SESSION binlog_row_image= 'FULL';
-SET GLOBAL binlog_row_image= 'FULL';
-include/stop_slave.inc
-include/start_slave.inc
-FLUSH TABLES;
-SHOW VARIABLES LIKE 'binlog_row_image';
-Variable_name	Value
-binlog_row_image	FULL
-connection server_3;
-### engines: MyISAM, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: MyISAM, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, MyISAM, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, MyISAM
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-### engines: InnoDB, InnoDB, InnoDB
-# Create sequences with specific engines per server
-connection server_1;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/save_master_gtid.inc
-connection server_2;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-connection server_3;
-SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
-include/sync_with_master_gtid.inc
-# Pt.1 Ensure SETVAL replicates and binlogs correctly
-connection server_1;
-SELECT SETVAL(s1, 10);
-SETVAL(s1, 10)
-10
-include/save_master_gtid.inc
-# Validate SETVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged SETVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged SETVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged SETVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
-connection server_1;
-SELECT NEXTVAL(s1);
-NEXTVAL(s1)
-11
-include/save_master_gtid.inc
-# Validate NEXTVAL replicated correctly to other servers
-connection server_3;
-include/sync_with_master_gtid.inc
-include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
-# Validate server_1 binlogged NEXTVAL with the correct columns
-connection server_1;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_2 binlogged NEXTVAL with the correct columns
-connection server_2;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Validate server_3 binlogged NEXTVAL with the correct columns
-connection server_3;
-FLUSH LOGS;
-include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
-# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
-# Verifying all expected column ids appear in binlog event output..
-# ..success
-# Verifying only expected column ids appear in binlog event output..
-# ..success
-# Cleanup
-connection server_1;
-DROP TABLE s1;
-include/save_master_gtid.inc
-connection server_3;
-include/sync_with_master_gtid.inc
-include/rpl_end.inc
-# End of tests
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result
new file mode 100644
index 00000000000..2303911637f
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result
@@ -0,0 +1,767 @@
+include/rpl_init.inc [topology=1->2->3]
+connection server_1;
+connection server_2;
+connection server_3;
+connection server_1;
+#
+# binlog_row_image=FULL should write all columns to the binary log
+#
+CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
+connection server_1;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+CON: 'server_2', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_2;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+CON: 'server_3', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_3;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+connection server_1;
+### engines: MyISAM, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+include/rpl_end.inc
+# End of tests
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result
new file mode 100644
index 00000000000..eaf770f245c
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result
@@ -0,0 +1,797 @@
+include/rpl_init.inc [topology=1->2->3]
+connection server_1;
+connection server_2;
+connection server_3;
+connection server_1;
+#
+# binlog_row_image=MINIMAL should write only columns 1 and 8 to the
+# binary log
+#
+CON: 'server_1', IMG: 'MINIMAL', RESTART SLAVE: 'N'
+connection server_1;
+SET SESSION binlog_row_image= 'MINIMAL';
+SET GLOBAL binlog_row_image= 'MINIMAL';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	MINIMAL
+CON: 'server_2', IMG: 'MINIMAL', RESTART SLAVE: 'Y'
+connection server_2;
+SET SESSION binlog_row_image= 'MINIMAL';
+SET GLOBAL binlog_row_image= 'MINIMAL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	MINIMAL
+CON: 'server_3', IMG: 'MINIMAL', RESTART SLAVE: 'Y'
+connection server_3;
+SET SESSION binlog_row_image= 'MINIMAL';
+SET GLOBAL binlog_row_image= 'MINIMAL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	MINIMAL
+connection server_1;
+### engines: MyISAM, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
+connection server_1;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+CON: 'server_2', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_2;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+CON: 'server_3', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_3;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+connection server_3;
+include/rpl_end.inc
+# End of tests
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result
new file mode 100644
index 00000000000..496bd8dc6b8
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result
@@ -0,0 +1,796 @@
+include/rpl_init.inc [topology=1->2->3]
+connection server_1;
+connection server_2;
+connection server_3;
+connection server_1;
+#
+# binlog_row_image=NOBLOB should write all columns to the binary logs
+#
+CON: 'server_1', IMG: 'NOBLOB', RESTART SLAVE: 'N'
+connection server_1;
+SET SESSION binlog_row_image= 'NOBLOB';
+SET GLOBAL binlog_row_image= 'NOBLOB';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	NOBLOB
+CON: 'server_2', IMG: 'NOBLOB', RESTART SLAVE: 'Y'
+connection server_2;
+SET SESSION binlog_row_image= 'NOBLOB';
+SET GLOBAL binlog_row_image= 'NOBLOB';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	NOBLOB
+CON: 'server_3', IMG: 'NOBLOB', RESTART SLAVE: 'Y'
+connection server_3;
+SET SESSION binlog_row_image= 'NOBLOB';
+SET GLOBAL binlog_row_image= 'NOBLOB';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	NOBLOB
+connection server_1;
+### engines: MyISAM, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: MyISAM, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, MyISAM, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, MyISAM
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=MyISAM;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+### engines: InnoDB, InnoDB, InnoDB
+# Create sequences with specific engines per server
+connection server_1;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/save_master_gtid.inc
+connection server_2;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+connection server_3;
+SET STATEMENT sql_log_bin=0 FOR create sequence s1 cache=0 engine=InnoDB;
+include/sync_with_master_gtid.inc
+# Pt.1 Ensure SETVAL replicates and binlogs correctly
+connection server_1;
+SELECT SETVAL(s1, 10);
+SETVAL(s1, 10)
+10
+include/save_master_gtid.inc
+# Validate SETVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged SETVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged SETVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged SETVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Pt.2 Ensure NEXTVAL replicates and binlogs correctly
+connection server_1;
+SELECT NEXTVAL(s1);
+NEXTVAL(s1)
+11
+include/save_master_gtid.inc
+# Validate NEXTVAL replicated correctly to other servers
+connection server_3;
+include/sync_with_master_gtid.inc
+include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
+# Validate server_1 binlogged NEXTVAL with the correct columns
+connection server_1;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_2 binlogged NEXTVAL with the correct columns
+connection server_2;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Validate server_3 binlogged NEXTVAL with the correct columns
+connection server_3;
+FLUSH LOGS;
+include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
+# MYSQL_BINLOG mysqld_datadir/binlog_filename -vv > assert_file
+# Verifying all expected column ids appear in binlog event output..
+# ..success
+# Verifying only expected column ids appear in binlog event output..
+# ..success
+# Cleanup
+connection server_1;
+DROP TABLE s1;
+include/save_master_gtid.inc
+connection server_3;
+include/sync_with_master_gtid.inc
+CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
+connection server_1;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+CON: 'server_2', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_2;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+CON: 'server_3', IMG: 'FULL', RESTART SLAVE: 'Y'
+connection server_3;
+SET SESSION binlog_row_image= 'FULL';
+SET GLOBAL binlog_row_image= 'FULL';
+include/stop_slave.inc
+include/start_slave.inc
+FLUSH TABLES;
+SHOW VARIABLES LIKE 'binlog_row_image';
+Variable_name	Value
+binlog_row_image	FULL
+connection server_3;
+include/rpl_end.inc
+# End of tests
diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result
index 3c3fed4d9cf..0bb3d9dc52a 100644
--- a/mysql-test/suite/rpl/r/rpl_sp.result
+++ b/mysql-test/suite/rpl/r/rpl_sp.result
@@ -305,7 +305,7 @@ a
 100
 connection con1;
 create trigger trg before insert on t1 for each row set new.a= 10;
-ERROR 42000: TRIGGER command denied to user 'zedjzlcsjhd'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'zedjzlcsjhd'@'localhost' for table `mysqltest1`.`t1`
 connection master;
 delete from t1;
 create trigger trg before insert on t1 for each row set new.a= 10;
diff --git a/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test b/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test
index 3a4a24e1762..8c4baafe23d 100644
--- a/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test
+++ b/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test
@@ -13,6 +13,7 @@
 # during this window while forcing a rotation in the binlog.
 #
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 --source include/master-slave.inc
 
 --connection master
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence.cnf b/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.cnf
index 7104b4e4502..7104b4e4502 100644
--- a/mysql-test/suite/rpl/t/rpl_row_img_sequence.cnf
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.cnf
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.test b/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.test
new file mode 100644
index 00000000000..a0c6aa4dc7a
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.test
@@ -0,0 +1,48 @@
+#
+# Purpose:
+#   The rpl_row_img_sequence group of tests verify that sequence MDL updates,
+# i.e. NEXTVAL and SETVAL, respect the binlog_row_image variable value when
+# written into the binary log. In particular, it ensures that only changed
+# columns are written with MINIMAL image mode, and all columns are written
+# otherwise. This test focuses on validating the behavior of
+# binlog_row_img=FULL.
+#
+# Methodology
+#   After issuing a sequence update, ensure that both 1) it was replicated
+# correctly, and 2) it was binlogged respective to the binlog_row_image value.
+# The sequence table does not use caching to ensure each update is immediately
+# binlogged. Each command is binlogged into its own unique log file, and the
+# entirety of the file is analyzed for correctness of its sequence event.
+# Specifically, mysqlbinlog is used in verbose mode so it outputs the columns
+# which belong to the event, and the columns are analyzed to ensure the correct
+# ones were logged. rpl_row_img_general_loop.inc is used to test with multiple
+# chained replicas, varying engines between InnoDB and MyISAM.
+#
+# References:
+#   MDEV-28487: sequences not respect value of binlog_row_image with select
+#               nextval(seq_gen)
+#
+
+--let $rpl_topology= 1->2->3
+--source include/rpl_init.inc
+--source include/have_binlog_format_row.inc
+
+--connection server_1
+--source include/have_innodb.inc
+--connection server_2
+--source include/have_innodb.inc
+--connection server_3
+--source include/have_innodb.inc
+--connection server_1
+
+--echo #
+--echo # binlog_row_image=FULL should write all columns to the binary log
+--echo #
+--let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y
+--source include/rpl_row_img_set.inc
+--let $expected_columns=(1,2,3,4,5,6,7,8)
+--let row_img_test_script= include/rpl_row_img_sequence.inc
+--source include/rpl_row_img_general_loop.inc
+
+--source include/rpl_end.inc
+--echo # End of tests
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf b/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf
new file mode 100644
index 00000000000..7104b4e4502
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf
@@ -0,0 +1,21 @@
+!include include/default_mysqld.cnf
+
+[mysqld.1]
+log-slave-updates
+innodb
+gtid_domain_id=0
+
+[mysqld.2]
+log-slave-updates
+innodb
+gtid_domain_id=1
+
+[mysqld.3]
+log-slave-updates
+innodb
+gtid_domain_id=2
+
+[ENV]
+SERVER_MYPORT_1= @mysqld.1.port
+SERVER_MYPORT_2= @mysqld.2.port
+SERVER_MYPORT_3= @mysqld.3.port
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence.test b/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.test
index 23860fb2de5..0a3b2827ffa 100644
--- a/mysql-test/suite/rpl/t/rpl_row_img_sequence.test
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.test
@@ -1,9 +1,11 @@
 #
 # Purpose:
-#   This test verifies that sequence DML updates, i.e. NEXTVAL and SETVAL,
-# respect the binlog_row_image variable value when written into the binary log.
-# In particular, it ensures that only changed columns are written with MINIMAL
-# image mode, and all columns are written otherwise.
+#   The rpl_row_img_sequence group of tests verify that sequence MDL updates,
+# i.e. NEXTVAL and SETVAL, respect the binlog_row_image variable value when
+# written into the binary log. In particular, it ensures that only changed
+# columns are written with MINIMAL image mode, and all columns are written
+# otherwise. This test focuses on validating the behavior of
+# binlog_row_img=MINIMAL.
 #
 # Methodology
 #   After issuing a sequence update, ensure that both 1) it was replicated
@@ -34,8 +36,8 @@
 --connection server_1
 
 --echo #
---echo # Test Case 1) binlog_row_image=MINIMAL should write only columns
---echo # 1 and 8 to the binary log
+--echo # binlog_row_image=MINIMAL should write only columns 1 and 8 to the
+--echo # binary log
 --echo #
 --let $row_img_set=server_1:MINIMAL:N,server_2:MINIMAL:Y,server_3:MINIMAL:Y
 --source include/rpl_row_img_set.inc
@@ -43,23 +45,8 @@
 --let row_img_test_script= include/rpl_row_img_sequence.inc
 --source include/rpl_row_img_general_loop.inc
 
---echo #
---echo # Test Case 2) binlog_row_image=NOBLOB should write all columns to the
---echo # binary log
---echo #
---let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y
---source include/rpl_row_img_set.inc
---let $expected_columns=(1,2,3,4,5,6,7,8)
---source include/rpl_row_img_general_loop.inc
-
---echo #
---echo # Test Case 3) binlog_row_image=NOBLOB should write all columns to the
---echo # binary log
---echo #
 --let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y
 --source include/rpl_row_img_set.inc
---let $expected_columns=(1,2,3,4,5,6,7,8)
---source include/rpl_row_img_general_loop.inc
 
 --source include/rpl_end.inc
 --echo # End of tests
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf b/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf
new file mode 100644
index 00000000000..7104b4e4502
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf
@@ -0,0 +1,21 @@
+!include include/default_mysqld.cnf
+
+[mysqld.1]
+log-slave-updates
+innodb
+gtid_domain_id=0
+
+[mysqld.2]
+log-slave-updates
+innodb
+gtid_domain_id=1
+
+[mysqld.3]
+log-slave-updates
+innodb
+gtid_domain_id=2
+
+[ENV]
+SERVER_MYPORT_1= @mysqld.1.port
+SERVER_MYPORT_2= @mysqld.2.port
+SERVER_MYPORT_3= @mysqld.3.port
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.test b/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.test
new file mode 100644
index 00000000000..38ff469f22f
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.test
@@ -0,0 +1,51 @@
+#
+# Purpose:
+#   The rpl_row_img_sequence group of tests verify that sequence MDL updates,
+# i.e. NEXTVAL and SETVAL, respect the binlog_row_image variable value when
+# written into the binary log. In particular, it ensures that only changed
+# columns are written with MINIMAL image mode, and all columns are written
+# otherwise. This test focuses on validating the behavior of
+# binlog_row_img=NOBLOB.
+#
+# Methodology
+#   After issuing a sequence update, ensure that both 1) it was replicated
+# correctly, and 2) it was binlogged respective to the binlog_row_image value.
+# The sequence table does not use caching to ensure each update is immediately
+# binlogged. Each command is binlogged into its own unique log file, and the
+# entirety of the file is analyzed for correctness of its sequence event.
+# Specifically, mysqlbinlog is used in verbose mode so it outputs the columns
+# which belong to the event, and the columns are analyzed to ensure the correct
+# ones were logged. rpl_row_img_general_loop.inc is used to test with multiple
+# chained replicas, varying engines between InnoDB and MyISAM.
+#
+# References:
+#   MDEV-28487: sequences not respect value of binlog_row_image with select
+#               nextval(seq_gen)
+#
+
+--let $rpl_topology= 1->2->3
+--source include/rpl_init.inc
+--source include/have_binlog_format_row.inc
+
+--connection server_1
+--source include/have_innodb.inc
+--connection server_2
+--source include/have_innodb.inc
+--connection server_3
+--source include/have_innodb.inc
+--connection server_1
+
+--echo #
+--echo # binlog_row_image=NOBLOB should write all columns to the binary logs
+--echo #
+--let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y
+--source include/rpl_row_img_set.inc
+--let $expected_columns=(1,2,3,4,5,6,7,8)
+--let row_img_test_script= include/rpl_row_img_sequence.inc
+--source include/rpl_row_img_general_loop.inc
+
+--let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y
+--source include/rpl_row_img_set.inc
+
+--source include/rpl_end.inc
+--echo # End of tests
diff --git a/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test b/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test
index 31a9478f632..d1bfbf25bae 100644
--- a/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test
+++ b/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test
@@ -20,6 +20,7 @@
 #   MDEV-16091: Seconds_Behind_Master spikes to millions of seconds
 #
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 --source include/have_innodb.inc
 --source include/master-slave.inc
 
diff --git a/mysql-test/suite/sql_sequence/alter_notembedded.result b/mysql-test/suite/sql_sequence/alter_notembedded.result
index 25b33dd742b..f3e1f5f18cd 100644
--- a/mysql-test/suite/sql_sequence/alter_notembedded.result
+++ b/mysql-test/suite/sql_sequence/alter_notembedded.result
@@ -9,12 +9,12 @@ select * from s1;
 next_not_cached_value	minimum_value	maximum_value	start_value	increment	cache_size	cycle_option	cycle_count
 1	1	9223372036854775806	1	1	1000	0	0
 select nextval(s1);
-ERROR 42000: INSERT command denied to user 'normal_1'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'normal_1'@'localhost' for table `s_db`.`s1`
 show create sequence s1;
 Table	Create Table
 s1	CREATE SEQUENCE `s1` start with 1 minvalue 1 maxvalue 9223372036854775806 increment by 1 cache 1000 nocycle ENGINE=MyISAM
 alter sequence s1 restart 50;
-ERROR 42000: ALTER command denied to user 'normal_1'@'localhost' for table 's1'
+ERROR 42000: ALTER command denied to user 'normal_1'@'localhost' for table `s_db`.`s1`
 connection default;
 grant insert on s_db.s1 to normal_1@'%';
 connection m_normal_1;
@@ -22,7 +22,7 @@ select nextval(s1);
 nextval(s1)
 1
 alter sequence s1 restart 50;
-ERROR 42000: ALTER command denied to user 'normal_1'@'localhost' for table 's1'
+ERROR 42000: ALTER command denied to user 'normal_1'@'localhost' for table `s_db`.`s1`
 connection default;
 grant alter on s_db.s1 to normal_1@'%';
 connection m_normal_1;
@@ -31,7 +31,7 @@ select nextval(s1);
 nextval(s1)
 50
 drop sequence s1;
-ERROR 42000: DROP command denied to user 'normal_1'@'localhost' for table 's1'
+ERROR 42000: DROP command denied to user 'normal_1'@'localhost' for table `s_db`.`s1`
 connection default;
 disconnect m_normal_1;
 drop database s_db;
diff --git a/mysql-test/suite/sql_sequence/grant.result b/mysql-test/suite/sql_sequence/grant.result
index 7085d548588..0a69d69fc74 100644
--- a/mysql-test/suite/sql_sequence/grant.result
+++ b/mysql-test/suite/sql_sequence/grant.result
@@ -22,9 +22,9 @@ next_not_cached_value	minimum_value	maximum_value	start_value	increment	cache_si
 11	1	9223372036854775806	1	1	1000	0	0
 connection read_only;
 select next value for s1;
-ERROR 42000: INSERT command denied to user 'read_only'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'read_only'@'localhost' for table `mysqltest_1`.`s1`
 alter sequence s1 restart= 11;
-ERROR 42000: ALTER command denied to user 'read_only'@'localhost' for table 's1'
+ERROR 42000: ALTER command denied to user 'read_only'@'localhost' for table `mysqltest_1`.`s1`
 select * from s1;
 next_not_cached_value	minimum_value	maximum_value	start_value	increment	cache_size	cycle_option	cycle_count
 11	1	9223372036854775806	1	1	1000	0	0
@@ -33,7 +33,7 @@ select next value for s1;
 next value for s1
 11
 alter sequence s1 restart= 11;
-ERROR 42000: ALTER command denied to user 'read_write'@'localhost' for table 's1'
+ERROR 42000: ALTER command denied to user 'read_write'@'localhost' for table `mysqltest_1`.`s1`
 select * from s1;
 next_not_cached_value	minimum_value	maximum_value	start_value	increment	cache_size	cycle_option	cycle_count
 1011	1	9223372036854775806	1	1	1000	0	0
@@ -47,10 +47,10 @@ next_not_cached_value	minimum_value	maximum_value	start_value	increment	cache_si
 11	1	9223372036854775806	1	1	1000	0	0
 connection only_alter;
 select next value for s1;
-ERROR 42000: INSERT command denied to user 'only_alter'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'only_alter'@'localhost' for table `mysqltest_1`.`s1`
 alter sequence s1 restart= 11;
 select * from s1;
-ERROR 42000: SELECT command denied to user 'only_alter'@'localhost' for table 's1'
+ERROR 42000: SELECT command denied to user 'only_alter'@'localhost' for table `mysqltest_1`.`s1`
 connection default;
 drop database mysqltest_1;
 drop user 'normal'@'%';
diff --git a/mysql-test/suite/sql_sequence/gtid.result b/mysql-test/suite/sql_sequence/gtid.result
index 495e4b806b7..5c0003d4ea3 100644
--- a/mysql-test/suite/sql_sequence/gtid.result
+++ b/mysql-test/suite/sql_sequence/gtid.result
@@ -174,9 +174,9 @@ create sequence s_db.s2;
 drop sequence s_db.s2;
 connection m_normal_2;
 select next value for s_db.s1;
-ERROR 42000: INSERT command denied to user 'normal_2'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'normal_2'@'localhost' for table `s_db`.`s1`
 create sequence s_db.s2;
-ERROR 42000: CREATE command denied to user 'normal_2'@'localhost' for table 's2'
+ERROR 42000: CREATE command denied to user 'normal_2'@'localhost' for table `s_db`.`s2`
 connection m_normal_1;
 drop sequence s_db.s1;
 ###########################################
@@ -796,11 +796,11 @@ select previous value for s1;
 previous value for s1
 NULL
 insert into t1 values (2);
-ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table `test`.`t1`
 select next value for s1;
-ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table `test`.`s1`
 do setval(s1,1000,0);
-ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'normal_5'@'localhost' for table `test`.`s1`
 connection master;
 grant insert on test.* to normal_5@'%' identified by 'pass';
 disconnect m_normal_3;
diff --git a/mysql-test/suite/sql_sequence/replication.result b/mysql-test/suite/sql_sequence/replication.result
index c429b74b4cd..762c332dbd6 100644
--- a/mysql-test/suite/sql_sequence/replication.result
+++ b/mysql-test/suite/sql_sequence/replication.result
@@ -285,9 +285,9 @@ create sequence s_db.s2;
 drop sequence s_db.s2;
 connection m_normal_2;
 select NEXT VALUE for s_db.s1;
-ERROR 42000: INSERT command denied to user 'normal_2'@'localhost' for table 's1'
+ERROR 42000: INSERT command denied to user 'normal_2'@'localhost' for table `s_db`.`s1`
 create sequence s_db.s2;
-ERROR 42000: CREATE command denied to user 'normal_2'@'localhost' for table 's2'
+ERROR 42000: CREATE command denied to user 'normal_2'@'localhost' for table `s_db`.`s2`
 connection m_normal_1;
 drop sequence s_db.s1;
 ###########################################
diff --git a/mysql-test/suite/stress/t/deadlock_drop_table.test b/mysql-test/suite/stress/t/deadlock_drop_table.test
index b49ca0b9fb7..0ec19f87389 100644
--- a/mysql-test/suite/stress/t/deadlock_drop_table.test
+++ b/mysql-test/suite/stress/t/deadlock_drop_table.test
@@ -1,4 +1,5 @@
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 
 create or replace table t1 (a int primary key, b int, c int, key(b),key(c)) engine=myisam;
 insert into t1 (a) values(1);
diff --git a/mysql-test/suite/sys_vars/t/sysvars_debug.test b/mysql-test/suite/sys_vars/t/sysvars_debug.test
index fbdcbd683df..6e64d48c6cd 100644
--- a/mysql-test/suite/sys_vars/t/sysvars_debug.test
+++ b/mysql-test/suite/sys_vars/t/sysvars_debug.test
@@ -1,4 +1,5 @@
 --source include/have_debug.inc
+--source include/have_debug_sync.inc
 --source include/word_size.inc
 
 --vertical_results
diff --git a/mysql-test/suite/versioning/r/not_embedded.result b/mysql-test/suite/versioning/r/not_embedded.result
index f17ab18349c..b8972a48370 100644
--- a/mysql-test/suite/versioning/r/not_embedded.result
+++ b/mysql-test/suite/versioning/r/not_embedded.result
@@ -47,7 +47,7 @@ show grants;
 Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
 delete history from mysqltest.t before system_time now();
-ERROR 42000: DELETE HISTORY command denied to user 'mysqltest_1'@'localhost' for table 't'
+ERROR 42000: DELETE HISTORY command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t`
 connection root;
 grant delete history on mysqltest.* to mysqltest_1@localhost;
 grant delete history on mysqltest.t to mysqltest_1@localhost;