summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/main/analyze_stmt_privileges.result6
-rw-r--r--mysql-test/main/analyze_stmt_privileges2.result1794
-rw-r--r--mysql-test/main/create_or_replace_permission.result2
-rw-r--r--mysql-test/main/cte_grant.result4
-rw-r--r--mysql-test/main/cte_nonrecursive_not_embedded.result2
-rw-r--r--mysql-test/main/flush-innodb-notembedded.result2
-rw-r--r--mysql-test/main/gis_notembedded.result2
-rw-r--r--mysql-test/main/grant.result92
-rw-r--r--mysql-test/main/grant2.result22
-rw-r--r--mysql-test/main/grant4.result26
-rw-r--r--mysql-test/main/grant5.result61
-rw-r--r--mysql-test/main/grant5.test72
-rw-r--r--mysql-test/main/grant_cache_no_prot.result6
-rw-r--r--mysql-test/main/grant_cache_ps_prot.result6
-rw-r--r--mysql-test/main/grant_explain_non_select.result68
-rw-r--r--mysql-test/main/grant_lowercase_fs.result4
-rw-r--r--mysql-test/main/information_schema_db.result16
-rw-r--r--mysql-test/main/insert_notembedded.result6
-rw-r--r--mysql-test/main/invisible_field_grant_completely.result4
-rw-r--r--mysql-test/main/invisible_field_grant_system.result4
-rw-r--r--mysql-test/main/lowercase_fs_off.result2
-rw-r--r--mysql-test/main/mysqlbinlog.result2
-rw-r--r--mysql-test/main/openssl_1.result6
-rw-r--r--mysql-test/main/partition_grant.result4
-rw-r--r--mysql-test/main/plugin_not_embedded.result2
-rw-r--r--mysql-test/main/ps_grant.result4
-rw-r--r--mysql-test/main/show_check.result8
-rw-r--r--mysql-test/main/sp-security-anchor-type.result18
-rw-r--r--mysql-test/main/sp-security.result28
-rw-r--r--mysql-test/main/status.result8
-rw-r--r--mysql-test/main/timezone_grant.result12
-rw-r--r--mysql-test/main/trigger_notembedded.result10
-rw-r--r--mysql-test/main/view_grant.result122
-rw-r--r--mysql-test/suite/compat/oracle/r/sp-security.result20
-rw-r--r--mysql-test/suite/engines/funcs/r/rpl_sp.result2
-rw-r--r--mysql-test/suite/funcs_1/r/innodb_storedproc_06.result32
-rw-r--r--mysql-test/suite/funcs_1/r/innodb_trig_03.result12
-rw-r--r--mysql-test/suite/funcs_1/r/innodb_trig_03e.result68
-rw-r--r--mysql-test/suite/funcs_1/r/is_columns.result6
-rw-r--r--mysql-test/suite/funcs_1/r/is_table_constraints.result2
-rw-r--r--mysql-test/suite/funcs_1/r/is_triggers.result4
-rw-r--r--mysql-test/suite/funcs_1/r/is_user_privileges.result16
-rw-r--r--mysql-test/suite/funcs_1/r/memory_storedproc_06.result32
-rw-r--r--mysql-test/suite/funcs_1/r/memory_trig_03.result12
-rw-r--r--mysql-test/suite/funcs_1/r/memory_trig_03e.result68
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_storedproc_06.result32
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_trig_03.result12
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_trig_03e.result68
-rw-r--r--mysql-test/suite/funcs_1/r/storedproc.result2
-rw-r--r--mysql-test/suite/galera/r/galera_roles.result20
-rw-r--r--mysql-test/suite/galera/r/rename.result2
-rw-r--r--mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result10
-rw-r--r--mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result10
-rw-r--r--mysql-test/suite/parts/r/partition_exch_qa_6.result6
-rw-r--r--mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result4
-rw-r--r--mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result4
-rw-r--r--mysql-test/suite/perfschema/r/connect_attrs.result4
-rw-r--r--mysql-test/suite/perfschema/r/dml_accounts.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_cond_instances.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esgs_by_user_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esgs_global_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_account_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_digest.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_host_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_thread_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_by_user_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_esms_global_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_stages_current.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_stages_history.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_stages_history_long.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_statements_current.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_statements_history.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_statements_history_long.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_waits_current.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_waits_history.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_events_waits_history_long.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_by_account_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_by_host_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_by_instance.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_by_user_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_file_instances.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_fs_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_fs_by_instance.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_host_cache.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_hosts.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_mutex_instances.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_os_global_by_type.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_performance_timers.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_rwlock_instances.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_session_account_connect_attrs.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_session_connect_attrs.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_setup_consumers.result6
-rw-r--r--mysql-test/suite/perfschema/r/dml_setup_instruments.result6
-rw-r--r--mysql-test/suite/perfschema/r/dml_setup_timers.result6
-rw-r--r--mysql-test/suite/perfschema/r/dml_socket_instances.result12
-rw-r--r--mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_threads.result6
-rw-r--r--mysql-test/suite/perfschema/r/dml_tiws_by_index_usage.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_tiws_by_table.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_tlws_by_table.result14
-rw-r--r--mysql-test/suite/perfschema/r/dml_users.result14
-rw-r--r--mysql-test/suite/perfschema/r/misc.result2
-rw-r--r--mysql-test/suite/perfschema/r/privilege.result128
-rw-r--r--mysql-test/suite/perfschema/r/setup_actors.result2
-rw-r--r--mysql-test/suite/roles/definer.result8
-rw-r--r--mysql-test/suite/roles/recursive.result16
-rw-r--r--mysql-test/suite/roles/recursive_dbug.result16
-rw-r--r--mysql-test/suite/roles/role_case_sensitive-10744.result4
-rw-r--r--mysql-test/suite/roles/role_grant_propagate-29458.result2
-rw-r--r--mysql-test/suite/roles/roles_tables_priv-29465.result6
-rw-r--r--mysql-test/suite/roles/set_and_drop.result18
-rw-r--r--mysql-test/suite/roles/set_default_role_clear.result4
-rw-r--r--mysql-test/suite/roles/set_default_role_for.result4
-rw-r--r--mysql-test/suite/roles/set_default_role_invalid.result6
-rw-r--r--mysql-test/suite/roles/set_default_role_new_connection.result6
-rw-r--r--mysql-test/suite/roles/set_role-5232.result2
-rw-r--r--mysql-test/suite/roles/set_role-database-recursive.result6
-rw-r--r--mysql-test/suite/roles/set_role-database-simple.result12
-rw-r--r--mysql-test/suite/roles/set_role-multiple-role.result6
-rw-r--r--mysql-test/suite/roles/set_role-recursive.result8
-rw-r--r--mysql-test/suite/roles/set_role-simple.result4
-rw-r--r--mysql-test/suite/roles/set_role-table-column-priv.result4
-rw-r--r--mysql-test/suite/roles/set_role-table-simple.result4
-rw-r--r--mysql-test/suite/rpl/r/rpl_sp.result2
-rw-r--r--mysql-test/suite/sql_sequence/alter_notembedded.result8
-rw-r--r--mysql-test/suite/sql_sequence/grant.result10
-rw-r--r--mysql-test/suite/sql_sequence/gtid.result10
-rw-r--r--mysql-test/suite/sql_sequence/replication.result4
-rw-r--r--mysql-test/suite/versioning/r/not_embedded.result2
-rw-r--r--sql/share/errmsg-utf8.txt38
-rw-r--r--sql/sp_head.cc2
-rw-r--r--sql/sql_acl.cc13
-rw-r--r--sql/sql_base.cc5
-rw-r--r--sql/sql_parse.cc24
-rw-r--r--sql/sql_show.cc9
-rw-r--r--sql/sql_view.cc3
-rw-r--r--storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_5_tokudb.result10
-rw-r--r--storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_8_tokudb.result4
144 files changed, 2032 insertions, 1909 deletions
diff --git a/mysql-test/main/analyze_stmt_privileges.result b/mysql-test/main/analyze_stmt_privileges.result
index d54b5b37863..092f577e1bd 100644
--- a/mysql-test/main/analyze_stmt_privileges.result
+++ b/mysql-test/main/analyze_stmt_privileges.result
@@ -11,11 +11,11 @@ CREATE USER u1@localhost;
grant ALL on db.v1 to u1@localhost;
connect con1,localhost,u1,,;
select * from db.t1;
-ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table `db`.`t1`
explain select * from db.t1;
-ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table `db`.`t1`
analyze select * from db.t1;
-ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table `db`.`t1`
select * from db.v1;
i c
2 bar
diff --git a/mysql-test/main/analyze_stmt_privileges2.result b/mysql-test/main/analyze_stmt_privileges2.result
index f269aaf540b..2b75f736a22 100644
--- a/mysql-test/main/analyze_stmt_privileges2.result
+++ b/mysql-test/main/analyze_stmt_privileges2.result
@@ -29,89 +29,89 @@ connection con1;
# because the query itself cannot be executed
#------------------------------------------------------------------------
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
#------------------------------------------------------------------------
# I/R/U/D/S on the inner view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -283,71 +283,71 @@ connection con1;
# Expectation: Can only run SELECT, EXPLAIN SELECT, ANALYZE SELECT
#------------------------------------------------------------------------
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1;
a b
10 NULL
@@ -634,77 +634,77 @@ ANALYZE INSERT INTO t1 SELECT * FROM t2;
id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
1 SIMPLE t2 ALL NULL NULL NULL NULL 3 3.00 100.00 100.00
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
#------------------------------------------------------------------------
# I/R/U/D/S on the inner view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -879,29 +879,29 @@ connection con1;
# read columns fail with ER_COLUMNACCESS_DENIED_ERROR
#------------------------------------------------------------------------
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
EXPLAIN UPDATE t1 SET a = 10;
id select_type table type possible_keys key key_len ref rows Extra
@@ -922,47 +922,47 @@ ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a'
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a' in table 't1'
DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
#------------------------------------------------------------------------
# I/R/U/D/S on the inner view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -1138,47 +1138,47 @@ connection con1;
#------------------------------------------------------------------------
# Note: ANALYZE DELETE FROM t1 USING t1, t2 ... fails due to MDEV-7043
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1;
EXPLAIN DELETE FROM t1;
id select_type table type possible_keys key key_len ref rows Extra
@@ -1193,35 +1193,35 @@ ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a'
ANALYZE DELETE FROM t1 WHERE a = 10;
ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a' in table 't1'
DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
#------------------------------------------------------------------------
# I/R/U/D/S on the inner view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -1394,47 +1394,47 @@ connection con1;
# Expectation: Can run DELETE, EXPLAIN DELETE, ANALYZE DELETE
#------------------------------------------------------------------------
INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1;
EXPLAIN DELETE FROM t1;
id select_type table type possible_keys key key_len ref rows Extra
@@ -1465,23 +1465,23 @@ ANALYZE DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL no matching row in const table
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
ANALYZE SELECT * FROM t1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
#------------------------------------------------------------------------
# I/R/U/D/S on the inner view
# Expectation: Can run everything: SELECT access to the column `a`
@@ -2077,89 +2077,89 @@ connection con1;
# Expectation: Cannot run anything
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -2252,89 +2252,89 @@ connection con1;
# Expectation: Cannot run anything
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -2430,71 +2430,71 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
a b
EXPLAIN SELECT * FROM v1;
@@ -2612,71 +2612,71 @@ connection con1;
# Expectation: Can run SELECT, EXPLAIN SELECT, ANALYZE SELECT
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
a b
EXPLAIN SELECT * FROM v1;
@@ -2838,77 +2838,77 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE INSERT INTO v1 SELECT * FROM t2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -3005,29 +3005,29 @@ connection con1;
# (it could have revealed the structure of the view).
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
EXPLAIN UPDATE v1 SET a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -3045,47 +3045,47 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -3181,29 +3181,29 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
EXPLAIN UPDATE v1 SET a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -3220,43 +3220,43 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE SELECT * FROM v1;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE SELECT * FROM v1 WHERE a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
@@ -3356,29 +3356,29 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
EXPLAIN UPDATE v1 SET a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -3395,29 +3395,29 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
a b
EXPLAIN SELECT * FROM v1;
@@ -3532,47 +3532,47 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
EXPLAIN DELETE FROM v1;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -3585,35 +3585,35 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE DELETE FROM v1 WHERE a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -3708,47 +3708,47 @@ connection con1;
# which don't read any columns
#------------------------------------------------------------------------
INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE INSERT INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE REPLACE INTO v1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE UPDATE v1, t2 SET v1.a = v1.a + 1 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
DELETE FROM v1;
EXPLAIN DELETE FROM v1;
id select_type table type possible_keys key key_len ref rows Extra
@@ -3763,35 +3763,35 @@ ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a'
ANALYZE DELETE FROM v1 WHERE a = 10;
ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a' in table 'v1'
DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
EXPLAIN SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
ANALYZE SELECT * FROM v1 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v1`
#------------------------------------------------------------------------
# I/R/U/D/S on the outer view
# Expectation: Can run the queries, but not EXPLAIN or ANALYZE
@@ -4123,89 +4123,89 @@ connection con1;
# Expectation: Cannot run anything
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant SHOW VIEW on the outer view
@@ -4219,89 +4219,89 @@ connection con1;
# Expectation: Cannot run anything
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant SHOW VIEW, SELECT(a) on the outer view
@@ -4317,71 +4317,71 @@ connection con1;
# when only `a` column is involved
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT a FROM v2;
a
EXPLAIN SELECT a FROM v2;
@@ -4391,17 +4391,17 @@ ANALYZE SELECT a FROM v2;
id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 39 39.00 100.00 0.00 Using where
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT a FROM v2 WHERE a = 10;
a
EXPLAIN SELECT a FROM v2 WHERE a = 10;
@@ -4411,11 +4411,11 @@ ANALYZE SELECT a FROM v2 WHERE a = 10;
id select_type table type possible_keys key key_len ref rows r_rows filtered r_filtered Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 39 39.00 100.00 0.00 Using where
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant SELECT on the outer view
@@ -4432,71 +4432,71 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
a b
EXPLAIN SELECT * FROM v2;
@@ -4529,71 +4529,71 @@ connection con1;
# Expectation: Can run SELECT, EXPLAIN SELECT, ANALYZE SELECT
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
a b
EXPLAIN SELECT * FROM v2;
@@ -4649,77 +4649,77 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE INSERT INTO v2 SELECT * FROM t2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant UPDATE on the outer view
@@ -4738,29 +4738,29 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
EXPLAIN UPDATE v2 SET a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -4778,47 +4778,47 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant UPDATE, SHOW VIEW on the outer view
@@ -4834,29 +4834,29 @@ connection con1;
# which do not read any columns
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
EXPLAIN UPDATE v2 SET a = 10;
id select_type table type possible_keys key key_len ref rows Extra
@@ -4878,47 +4878,47 @@ ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a'
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a' in table 'v2'
DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant DELETE on the outer view
@@ -4936,47 +4936,47 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2;
EXPLAIN DELETE FROM v2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
@@ -4989,35 +4989,35 @@ ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for unde
ANALYZE DELETE FROM v2 WHERE a = 10;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE DELETE FROM v2 USING v2, t2 WHERE v2.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a = 10;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE SELECT * FROM v2 WHERE a IN ( SELECT a FROM t2 );
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
#========================================================================
# Test: Grant DELETE, SELECT on the outer view
@@ -5034,43 +5034,43 @@ connection con1;
# (it could have revealed the structure of the view)
#------------------------------------------------------------------------
INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE INSERT INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 (a) VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE REPLACE INTO v2 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = 10;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
ANALYZE UPDATE v2 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 'v2'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`v2`
EXPLAIN UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
ANALYZE UPDATE v2, t2 SET v2.a = v2.a + 1 WHERE v2.a = t2.a;
diff --git a/mysql-test/main/create_or_replace_permission.result b/mysql-test/main/create_or_replace_permission.result
index b9938e4270a..1ea15d9621b 100644
--- a/mysql-test/main/create_or_replace_permission.result
+++ b/mysql-test/main/create_or_replace_permission.result
@@ -32,7 +32,7 @@ CREATE OR REPLACE DATABASE db2;
ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'db2'
USE db1;
CREATE OR REPLACE TABLE t1(id INT);
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `db1`.`t1`
CREATE OR REPLACE PROCEDURE proc1 (OUT cnt INT) BEGIN END;
ERROR 42000: alter routine command denied to user 'mysqltest_1'@'localhost' for routine 'db1.proc1'
CREATE OR REPLACE FUNCTION lookup RETURNS STRING SONAME "UDF_EXAMPLE_LIB";
diff --git a/mysql-test/main/cte_grant.result b/mysql-test/main/cte_grant.result
index 2ee31be3435..96588d26b6c 100644
--- a/mysql-test/main/cte_grant.result
+++ b/mysql-test/main/cte_grant.result
@@ -51,7 +51,7 @@ c
select d from mysqltest.v2;
ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'd' in table 'v2'
select * from mysqltest.v3;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v3'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3`
connection root;
grant select on mysqltest.v3 to mysqltest_1@localhost;
connection user1;
@@ -116,7 +116,7 @@ revoke SELECT on db.t1 from foo@localhost;
connection con1;
with cte as (select * from t1 where i < 4)
select * from cte;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db`.`t1`
disconnect con1;
connection default;
drop database db;
diff --git a/mysql-test/main/cte_nonrecursive_not_embedded.result b/mysql-test/main/cte_nonrecursive_not_embedded.result
index c96a1ec2849..fa4d97d7bc5 100644
--- a/mysql-test/main/cte_nonrecursive_not_embedded.result
+++ b/mysql-test/main/cte_nonrecursive_not_embedded.result
@@ -39,7 +39,7 @@ cte3 AS
cte4 AS
(SELECT cte2.a FROM t2,cte2 WHERE cte2.a = t2.a)
SELECT * FROM cte4 as r;
-ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'u1'@'localhost' for table `db`.`t2`
disconnect u1;
connection default;
DROP USER 'u1'@'localhost';
diff --git a/mysql-test/main/flush-innodb-notembedded.result b/mysql-test/main/flush-innodb-notembedded.result
index 0b63a7b3519..279e52ae1cf 100644
--- a/mysql-test/main/flush-innodb-notembedded.result
+++ b/mysql-test/main/flush-innodb-notembedded.result
@@ -30,7 +30,7 @@ disconnect con1;
connection default;
connect con1, localhost, user5;
FLUSH TABLE db1.t1 FOR EXPORT;
-ERROR 42000: SELECT command denied to user 'user5'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user5'@'localhost' for table `db1`.`t1`
disconnect con1;
connection default;
DROP USER user1@localhost, user2@localhost, user3@localhost,
diff --git a/mysql-test/main/gis_notembedded.result b/mysql-test/main/gis_notembedded.result
index 9120a2a1fa6..05be4e61dd6 100644
--- a/mysql-test/main/gis_notembedded.result
+++ b/mysql-test/main/gis_notembedded.result
@@ -39,7 +39,7 @@ create user foo@localhost;
grant execute on mysql.* to foo@localhost;
connect foo, localhost, foo;
call mysql.AddGeometryColumn('', 'mysql', 'proc', 'c', 10);
-ERROR 42000: ALTER command denied to user 'foo'@'localhost' for table 'proc'
+ERROR 42000: ALTER command denied to user 'foo'@'localhost' for table `mysql`.`proc`
disconnect foo;
connection default;
drop user foo@localhost;
diff --git a/mysql-test/main/grant.result b/mysql-test/main/grant.result
index f0359b4aca2..332b74d2e93 100644
--- a/mysql-test/main/grant.result
+++ b/mysql-test/main/grant.result
@@ -549,9 +549,9 @@ ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for column
update mysqltest_1.t2, mysqltest_2.t2 set d=20 where d=1;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'd' in table 't2'
update mysqltest_1.t1, mysqltest_2.t2 set d=20 where d=1;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_1`.`t1`
update mysqltest_2.t1, mysqltest_1.t2 set c=20 where b=1;
-ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_2`.`t1`
update mysqltest_2.t1, mysqltest_2.t2 set d=10 where s=2;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 's' in table 't1'
update mysqltest_1.t1, mysqltest_2.t2 set a=10,d=10;
@@ -577,14 +577,14 @@ connection conn2;
use mysqltest_1;
update mysqltest_2.t1, mysqltest_2.t2 set c=500,d=600;
update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
-ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_1`.`t1`
use mysqltest_2;
update mysqltest_1.t1, mysqltest_1.t2 set a=100,b=200;
-ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_1`.`t1`
update mysqltest_2.t1, mysqltest_1.t2 set c=100,b=200;
-ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't2'
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_1`.`t2`
update mysqltest_1.t1, mysqltest_2.t2 set a=100,d=200;
-ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_3'@'localhost' for table `mysqltest_1`.`t1`
connection master;
select t1.*,t2.* from mysqltest_1.t1,mysqltest_1.t2;
a q b r
@@ -642,7 +642,7 @@ grant all on mysqltest.t1 to mysqltest_1@localhost;
connect user1,localhost,mysqltest_1,,mysqltest,$MASTER_MYPORT,$MASTER_MYSOCK;
connection user1;
alter table t1 rename t2;
-ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t2`
disconnect user1;
connection root;
revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
@@ -831,7 +831,7 @@ grant insert, create on db27515.t2 to user27515@localhost;
connect conn27515, localhost, user27515, , db27515;
connection conn27515;
rename table t1 to t2;
-ERROR 42000: DROP command denied to user 'user27515'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'user27515'@'localhost' for table `db27515`.`t1`
disconnect conn27515;
connection master;
revoke all privileges, grant option from user27515@localhost;
@@ -1065,13 +1065,13 @@ GRANT SELECT ON mysqltest2.* TO 'mysqltest_1'@'localhost' IDENTIFIE
GRANT SHOW VIEW,SELECT ON mysqltest2.v_yy TO 'mysqltest_1'@'localhost' IDENTIFIED BY 'mysqltest_1';
connect mysqltest_1, localhost, mysqltest_1, mysqltest_1,;
SHOW CREATE VIEW mysqltest2.v_nn;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`v_nn`
SHOW CREATE TABLE mysqltest2.v_nn;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`v_nn`
SHOW CREATE VIEW mysqltest2.v_yn;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_yn'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`v_yn`
SHOW CREATE TABLE mysqltest2.v_yn;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_yn'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`v_yn`
SHOW CREATE TABLE mysqltest2.v_ny;
View Create View character_set_client collation_connection
v_ny CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqltest2`.`v_ny` AS select `mysqltest2`.`t_nn`.`c1` AS `c1` from `mysqltest2`.`t_nn` latin1 latin1_swedish_ci
@@ -1079,13 +1079,13 @@ SHOW CREATE VIEW mysqltest2.v_ny;
View Create View character_set_client collation_connection
v_ny CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqltest2`.`v_ny` AS select `mysqltest2`.`t_nn`.`c1` AS `c1` from `mysqltest2`.`t_nn` latin1 latin1_swedish_ci
SHOW CREATE TABLE mysqltest3.t_nn;
-ERROR 42000: SHOW command denied to user 'mysqltest_1'@'localhost' for table 't_nn'
+ERROR 42000: SHOW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest3`.`t_nn`
SHOW CREATE VIEW mysqltest3.t_nn;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't_nn'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest3`.`t_nn`
SHOW CREATE VIEW mysqltest3.v_nn;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest3`.`v_nn`
SHOW CREATE TABLE mysqltest3.v_nn;
-ERROR 42000: SHOW command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'
+ERROR 42000: SHOW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest3`.`v_nn`
SHOW CREATE TABLE mysqltest2.t_nn;
Table Create Table
t_nn CREATE TABLE `t_nn` (
@@ -1150,17 +1150,17 @@ Grants for mysqltest_1@localhost
GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
GRANT SELECT ON `mysqltest1`.`t1` TO `mysqltest_1`@`localhost`
RENAME TABLE t1 TO t2;
-ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
ALTER TABLE t1 RENAME TO t2;
-ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
disconnect conn42;
connection default;
GRANT DROP ON mysqltest1.t1 TO mysqltest_1@localhost;
connect conn42,localhost,mysqltest_1,,mysqltest1;
RENAME TABLE t1 TO t2;
-ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
ALTER TABLE t1 RENAME TO t2;
-ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
disconnect conn42;
connection default;
GRANT ALTER ON mysqltest1.t1 TO mysqltest_1@localhost;
@@ -1170,9 +1170,9 @@ Grants for mysqltest_1@localhost
GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
GRANT SELECT, DROP, ALTER ON `mysqltest1`.`t1` TO `mysqltest_1`@`localhost`
RENAME TABLE t1 TO t2;
-ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t2`
ALTER TABLE t1 RENAME TO t2;
-ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t2`
disconnect conn42;
connection default;
GRANT INSERT, CREATE ON mysqltest1.t1 TO mysqltest_1@localhost;
@@ -1206,9 +1206,9 @@ GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
GRANT SELECT, CREATE, ALTER ON `mysqltest1`.`t1` TO `mysqltest_1`@`localhost`
GRANT SELECT, CREATE, ALTER ON `mysqltest1`.`t2` TO `mysqltest_1`@`localhost`
RENAME TABLE t1 TO t2;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
ALTER TABLE t1 RENAME TO t2;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `mysqltest1`.`t1`
disconnect conn42;
connection default;
DROP USER mysqltest_1@localhost;
@@ -1250,7 +1250,7 @@ GRANT DELETE ON t1 TO bug23556@localhost;
connection bug23556;
USE bug23556;
TRUNCATE t1;
-ERROR 42000: DROP command denied to user 'bug23556'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'bug23556'@'localhost' for table `bug23556`.`t1`
connection default;
USE bug23556;
REVOKE DELETE ON t1 FROM bug23556@localhost;
@@ -1328,16 +1328,16 @@ CREATE PROCEDURE mysqltest1.p1() SQL SECURITY INVOKER
SELECT 1;
connect bug27337_con1,localhost,mysqltest_1,,mysqltest2;
CREATE TABLE t1(c INT);
-ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`t1`
CALL mysqltest1.p1();
1
1
CREATE TABLE t1(c INT);
-ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`t1`
disconnect bug27337_con1;
connect bug27337_con2,localhost,mysqltest_1,,mysqltest2;
CREATE TABLE t1(c INT);
-ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: CREATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest2`.`t1`
SHOW TABLES;
Tables_in_mysqltest2
connection default;
@@ -1379,9 +1379,9 @@ EXECUTE stmt1;
ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysqltest1'
connection bug27337_con2;
SHOW COLUMNS FROM mysqltest2.t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysqltest2`.`t2`
EXECUTE stmt2;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysqltest2`.`t2`
connection default;
disconnect bug27337_con1;
disconnect bug27337_con2;
@@ -1502,11 +1502,11 @@ CALL p1;
ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for column 'b' in table 't1'
# - Check table-level privileges...
SELECT a FROM t2;
-ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table `mysqltest1`.`t2`
EXECUTE s2;
-ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table `mysqltest1`.`t2`
CALL p2;
-ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'testuser'@'localhost' for table `mysqltest1`.`t2`
# - Check database-level privileges...
SHOW TABLES FROM mysqltest2;
ERROR 42000: Access denied for user 'testuser'@'localhost' to database 'mysqltest2'
@@ -1641,9 +1641,9 @@ ERROR 42000: execute command denied to user 'mysqluser1'@'localhost' for routine
select mysqltest1.f1();
ERROR 42000: execute command denied to user 'mysqluser1'@'localhost' for routine 'mysqltest1.f1'
select * from mysqltest1.t11;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 't11'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`t11`
select * from mysqltest1.t22;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 't22'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`t22`
disconnect bug36544_con2;
connection default;
#
@@ -1665,9 +1665,9 @@ ERROR 42000: execute command denied to user 'mysqluser1'@'localhost' for routine
select mysqltest1.f1();
ERROR 42000: execute command denied to user 'mysqluser1'@'localhost' for routine 'mysqltest1.f1'
select * from mysqltest1.t11;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 't11'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`t11`
select * from mysqltest1.t22;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 't22'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`t22`
disconnect bug36544_con3;
connection default;
#
@@ -1718,7 +1718,7 @@ create table t1 (i INT);
connect user1,localhost,mysqltest,,mysqltest;
connection user1;
insert into t1 values (1);
-ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t1`
create table t2 (i INT);
create table t4 (i INT);
connection default;
@@ -1730,20 +1730,20 @@ flush privileges;
connection user1;
insert into t2 values (1);
create table if not exists t1 select * from t2;
-ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t1`
create table if not exists t3 select * from t2;
-ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't3'
+ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t3`
create table if not exists t4 select * from t2;
Warnings:
Note 1050 Table 't4' already exists
create table if not exists t5 select * from t2;
create table t6 select * from t2;
create table t7 select * from t2;
-ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't7'
+ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t7`
create table t4 select * from t2;
ERROR 42S01: Table 't4' already exists
create table t1 select * from t2;
-ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'mysqltest'@'localhost' for table `mysqltest`.`t1`
connection default;
drop table t1,t2,t4,t5,t6;
revoke create on mysqltest.* from mysqltest@localhost;
@@ -1906,7 +1906,7 @@ connect con1,localhost,testbug,,db1;
SELECT * FROM `../db2/tb2`;
ERROR 42S02: Table 'db1.../db2/tb2' doesn't exist
SELECT * FROM `../db2`.tb2;
-ERROR 42000: SELECT command denied to user 'testbug'@'localhost' for table 'tb2'
+ERROR 42000: SELECT command denied to user 'testbug'@'localhost' for table `../db2`.`tb2`
SELECT * FROM `#mysql50#/../db2/tb2`;
ERROR 42000: Incorrect table name '#mysql50#/../db2/tb2'
connection default;
@@ -1971,7 +1971,7 @@ connect con1,localhost,mysqltest_u1,,mysqltest_db1;
connection con1;
SHOW CREATE TABLE t1;
-ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t1`
connection default;
disconnect con1;
@@ -2777,10 +2777,10 @@ CREATE DATABASE db;
CREATE TABLE db.t (a INT);
connect con1,localhost,foo,,;
GRANT ALL ON db.t TO foo;
-ERROR 42000: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW ... command denied to user 'foo'@'localhost' for table 't'
+ERROR 42000: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW ... command denied to user 'foo'@'localhost' for table `db`.`t`
GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, GRANT OPTION, REFERENCES,
INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON db.t TO foo;
-ERROR 42000: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW ... command denied to user 'foo'@'localhost' for table 't'
+ERROR 42000: SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, GRANT, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW ... command denied to user 'foo'@'localhost' for table `db`.`t`
connection default;
disconnect con1;
DROP USER foo;
diff --git a/mysql-test/main/grant2.result b/mysql-test/main/grant2.result
index e94d233c5bf..5bd44d0bd22 100644
--- a/mysql-test/main/grant2.result
+++ b/mysql-test/main/grant2.result
@@ -107,9 +107,9 @@ GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
GRANT SELECT, INSERT ON `mysqltest`.* TO `mysqltest_1`@`localhost`
insert into t1 values (1, 'I can''t change it!');
update t1 set data='I can change it!' where id = 1;
-ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t1`
insert into t1 values (1, 'XXX') on duplicate key update data= 'I can change it!';
-ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t1`
select * from t1;
id data
1 I can't change it!
@@ -126,7 +126,7 @@ connection mrugly;
grant select (a,b) on t1 to mysqltest_2@localhost;
ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'b' in table 't1'
grant select on t1 to mysqltest_3@localhost;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t1`
disconnect mrugly;
connection default;
drop table t1;
@@ -311,7 +311,7 @@ grant create user on *.* to mysqltest_2@localhost;
connect user3,localhost,mysqltest_2,,;
connection user3;
select host,user,password from mysql.user where user like 'mysqltest_%' order by host,user,password;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysql`.`user`
create user mysqltest_A@'%';
rename user mysqltest_A@'%' to mysqltest_B@'%';
drop user mysqltest_B@'%';
@@ -327,7 +327,7 @@ Grants for mysqltest_3@localhost
GRANT USAGE ON *.* TO `mysqltest_3`@`localhost`
GRANT INSERT, UPDATE, DELETE ON `mysql`.* TO `mysqltest_3`@`localhost`
select host,user,password from mysql.user where user like 'mysqltest_%' order by host,user,password;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysql`.`user`
insert into mysql.user set host='%', user='mysqltest_B';
Warnings:
Warning 1364 Field 'ssl_cipher' doesn't have a default value
@@ -483,9 +483,9 @@ create table t1 (i int);
connect user1,localhost,mysqltest_u1,,mysqltest_1;
connection user1;
show create table mysqltest_2.t1;
-ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_2`.`t1`
create table t1 like mysqltest_2.t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_2`.`t1`
connection default;
grant select on mysqltest_2.t1 to mysqltest_u1@localhost;
connection user1;
@@ -540,7 +540,7 @@ USE db1;
SELECT c FROM t2;
ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2'
SELECT * FROM t2;
-ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for table `db1`.`t2`
SELECT * FROM t1 JOIN t2 USING (b);
ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2'
connection default;
@@ -645,7 +645,7 @@ CREATE TEMPORARY TABLE t4 SELECT * FROM t1;
# temporary table without additional privileges.
CREATE TEMPORARY TABLE t5(a INT) ENGINE = MyISAM;
CREATE TEMPORARY TABLE t6(a INT) ENGINE = MERGE UNION = (t5);
-ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u1'@'localhost' for table 't5'
+ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t5`
# Check that we allow creation of MERGE table with no underlying table
# without additional privileges.
CREATE TEMPORARY TABLE t6(a INT) ENGINE = MERGE UNION = ();
@@ -673,7 +673,7 @@ ALTER TABLE t6 UNION = ();
# Check that we do *not* allow altering of MERGE table with underlying
# temporary table without additional privileges.
ALTER TABLE t6 UNION = (t5);
-ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u1'@'localhost' for table 't5'
+ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t5`
#
# Simple INSERT and INSERT ... SELECT.
#
@@ -918,7 +918,7 @@ CREATE TEMPORARY TABLE t9(a INT);
CREATE TEMPORARY TABLE t10(a INT) ENGINE = MERGE UNION = (t7, t8);
ALTER TABLE t10 UNION = (t9);
ALTER TABLE t10 UNION = (mysqltest_db2.t2_1);
-ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u5'@'localhost' for table 't2_1'
+ERROR 42000: SELECT, UPDATE, DELETE command denied to user 'mysqltest_u5'@'localhost' for table `mysqltest_db2`.`t2_1`
CREATE TEMPORARY TABLE mysqltest_db2.t2_2(a INT) ENGINE = MERGE UNION = (t7, t8);
ALTER TABLE mysqltest_db2.t2_2 UNION = (t9);
ALTER TABLE mysqltest_db2.t2_2 UNION = ();
diff --git a/mysql-test/main/grant4.result b/mysql-test/main/grant4.result
index 5ee7081e98e..5ceee9c0660 100644
--- a/mysql-test/main/grant4.result
+++ b/mysql-test/main/grant4.result
@@ -30,23 +30,23 @@ a int(11) YES NULL
** SHOW COLUMNS
** Should fail because there are no privileges on any column combination.
show columns from mysqltest_db1.t_no_priv;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't_no_priv'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t_no_priv`
** However, select from I_S.COLUMNS will succeed but not show anything:
select column_name as 'Field',column_type as 'Type',is_nullable as 'Null',column_key as 'Key',column_default as 'Default',extra as 'Extra' from information_schema.columns where table_schema='mysqltest_db1' and table_name='t_no_priv';
Field Type Null Key Default Extra
** CREATE TABLE ... LIKE ... require SELECT privleges and will fail.
create table test.t_no_priv like mysqltest_db1.column_priv_only;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'column_priv_only'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`column_priv_only`
** Just to be sure... SELECT also fails.
select * from mysqltest_db1.t_column_priv_only;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't_column_priv_only'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t_column_priv_only`
** SHOW CREATE TABLE ... require any privileges on all columns (the entire table).
** First we try and fail on a table with only one column privilege.
show create table mysqltest_db1.t_column_priv_only;
-ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table 't_column_priv_only'
+ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t_column_priv_only`
** Now we do the same on a table with SELECT privileges.
@@ -72,7 +72,7 @@ t_select_priv CREATE TABLE `t_select_priv` (
** SHOW CREATE TABLE will fail if there is no grants at all:
show create table mysqltest_db1.t_no_priv;
-ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table 't_no_priv'
+ERROR 42000: SHOW command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t_no_priv`
connection default;
use mysqltest_db1;
@@ -97,7 +97,7 @@ SELECT * FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name='t5';
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT INDEX_COMMENT
** SHOW INDEX FROM t5 will fail because we don't have any privileges on any column combination.
SHOW INDEX FROM t5;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't5'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t5`
** SHOW INDEX FROM t6 will succeed because there exist a privilege on a column combination on t6.
SHOW INDEX FROM t6;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
@@ -108,20 +108,20 @@ Table Op Msg_type Msg_text
mysqltest_db1.t6 check status OK
** With no privileges access is naturally denied:
CHECK TABLE t5;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't5'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t5`
** CHECKSUM TABLE requires SELECT privileges on the table. The following should fail:
CHECKSUM TABLE t6;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't6'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t6`
** And this should work:
CHECKSUM TABLE t_select_priv;
Table Checksum
mysqltest_db1.t_select_priv 0
SHOW CREATE VIEW v5;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`v5`
SHOW CREATE VIEW v6;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'v6'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`v6`
SHOW CREATE VIEW v2;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`v2`
SHOW CREATE VIEW v3;
View Create View character_set_client collation_connection
v3 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t_select_priv`.`a` AS `a`,`t_select_priv`.`b` AS `b` from `t_select_priv` latin1 latin1_swedish_ci
@@ -189,10 +189,10 @@ mysqltest_db1.t1 check error Corrupt
# The below statement should fail before repairing t1.
# Otherwise info about such repair will be missing from its result-set.
repair table mysqltest_db1.t1, mysqltest_db1.t2;
-ERROR 42000: SELECT, INSERT command denied to user 'mysqltest_u1'@'localhost' for table 't2'
+ERROR 42000: SELECT, INSERT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t2`
# The same is true for CHECK TABLE statement.
check table mysqltest_db1.t1, mysqltest_db1.t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t2`
check table mysqltest_db1.t1;
Table Op Msg_type Msg_text
mysqltest_db1.t1 check warning Table is marked as crashed
diff --git a/mysql-test/main/grant5.result b/mysql-test/main/grant5.result
index 83cd8677089..7868effeb2c 100644
--- a/mysql-test/main/grant5.result
+++ b/mysql-test/main/grant5.result
@@ -181,4 +181,65 @@ GRANT USAGE ON *.* TO `test-user`@`%`
SET DEFAULT ROLE `r``o'l"e` FOR `test-user`@`%`
DROP ROLE `r``o'l"e`;
DROP USER 'test-user';
+#
+# MDEV-28548: ER_TABLEACCESS_DENIED_ERROR is missing information about DB
+#
+create database db1;
+create user foo@localhost;
+grant create on db1.* to foo@localhost;
+connect con1,localhost,foo,,db1;
+create table t(t int);
+show columns in t;
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db1`.`t`
+show columns in db1.t;
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db1`.`t`
+create view t_v as select * from t;
+ERROR 42000: CREATE VIEW command denied to user 'foo'@'localhost' for table `db1`.`t_v`
+show create view t_v;
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db1`.`t_v`
+create table t2(id int primary key, b int);
+create table t3(a int, b int, CONSTRAINT `fk_db2_db1_t1`
+ FOREIGN KEY (a)
+REFERENCES `db1 `.t1 (a)
+ON DELETE CASCADE
+ON UPDATE RESTRICT);
+ERROR 42000: Incorrect database name 'db1 '
+create table t3(a int, b int, CONSTRAINT `fk_db2_db3_t1`
+ FOREIGN KEY (a)
+REFERENCES db3.t1 (a)
+ON DELETE CASCADE
+ON UPDATE RESTRICT);
+ERROR 42000: REFERENCES command denied to user 'foo'@'localhost' for table `db3`.`t1`
+create table t1(a int, b int, CONSTRAINT `fk_db2_db3_t1`
+ FOREIGN KEY (a)
+REFERENCES t2 (id)
+ON DELETE CASCADE
+ON UPDATE RESTRICT);
+ERROR 42000: REFERENCES command denied to user 'foo'@'localhost' for table `db1`.`t2`
+connection default;
+disconnect con1;
+grant create view, select on db1.* to foo@localhost;
+connect con1,localhost,foo,,db1;
+create view t_v as select * from t;
+show grants;
+Grants for foo@localhost
+GRANT USAGE ON *.* TO `foo`@`localhost`
+GRANT SELECT, CREATE, CREATE VIEW ON `db1`.* TO `foo`@`localhost`
+show create view t_v;
+ERROR 42000: SHOW VIEW command denied to user 'foo'@'localhost' for table `db1`.`t_v`
+connection default;
+disconnect con1;
+grant show view on db1.* to foo@localhost;
+connect con1,localhost,foo,,db1;
+show grants;
+Grants for foo@localhost
+GRANT USAGE ON *.* TO `foo`@`localhost`
+GRANT SELECT, CREATE, CREATE VIEW, SHOW VIEW ON `db1`.* TO `foo`@`localhost`
+show create view t_v;
+View Create View character_set_client collation_connection
+t_v CREATE ALGORITHM=UNDEFINED DEFINER=`foo`@`localhost` SQL SECURITY DEFINER VIEW `t_v` AS select `t`.`t` AS `t` from `t` latin1 latin1_swedish_ci
+connection default;
+disconnect con1;
+drop database db1;
+drop user foo@localhost;
# End of 10.3 tests
diff --git a/mysql-test/main/grant5.test b/mysql-test/main/grant5.test
index bd711640acb..dc61c10646b 100644
--- a/mysql-test/main/grant5.test
+++ b/mysql-test/main/grant5.test
@@ -135,4 +135,76 @@ SHOW GRANTS FOR 'test-user';
DROP ROLE `r``o'l"e`;
DROP USER 'test-user';
+--echo #
+--echo # MDEV-28548: ER_TABLEACCESS_DENIED_ERROR is missing information about DB
+--echo #
+
+create database db1;
+create user foo@localhost;
+grant create on db1.* to foo@localhost;
+
+--connect (con1,localhost,foo,,db1)
+create table t(t int);
+--error ER_TABLEACCESS_DENIED_ERROR
+show columns in t;
+--error ER_TABLEACCESS_DENIED_ERROR
+show columns in db1.t;
+# CREATE_VIEW_ACL needed
+--error ER_TABLEACCESS_DENIED_ERROR
+create view t_v as select * from t;
+# show create view needs to have SELECT_ACL and SHOW_VIEW_ACL
+--error ER_TABLEACCESS_DENIED_ERROR
+show create view t_v;
+
+create table t2(id int primary key, b int);
+
+# Reference non existing DB with wrong DB name
+--error ER_WRONG_DB_NAME
+create table t3(a int, b int, CONSTRAINT `fk_db2_db1_t1`
+ FOREIGN KEY (a)
+ REFERENCES `db1 `.t1 (a)
+ ON DELETE CASCADE
+ ON UPDATE RESTRICT);
+
+# Reference non-existing DB (with qualified DB name)
+--error ER_TABLEACCESS_DENIED_ERROR
+create table t3(a int, b int, CONSTRAINT `fk_db2_db3_t1`
+ FOREIGN KEY (a)
+ REFERENCES db3.t1 (a)
+ ON DELETE CASCADE
+ ON UPDATE RESTRICT);
+
+# Reference DB (with not qualified DB name)
+--error ER_TABLEACCESS_DENIED_ERROR
+create table t1(a int, b int, CONSTRAINT `fk_db2_db3_t1`
+ FOREIGN KEY (a)
+ REFERENCES t2 (id)
+ ON DELETE CASCADE
+ ON UPDATE RESTRICT);
+
+--connection default
+--disconnect con1
+# Add CREATE_VIEW_ACL and SELECT_ACL
+grant create view, select on db1.* to foo@localhost;
+
+--connect (con1,localhost,foo,,db1)
+create view t_v as select * from t;
+show grants;
+--error ER_TABLEACCESS_DENIED_ERROR
+show create view t_v;
+
+--connection default
+--disconnect con1
+# Add SHOW_VIEW_ACL
+grant show view on db1.* to foo@localhost;
+
+--connect (con1,localhost,foo,,db1)
+show grants;
+show create view t_v;
+
+--connection default
+--disconnect con1
+drop database db1;
+drop user foo@localhost;
+
--echo # End of 10.3 tests
diff --git a/mysql-test/main/grant_cache_no_prot.result b/mysql-test/main/grant_cache_no_prot.result
index 780fb254b76..1ecfc308422 100644
--- a/mysql-test/main/grant_cache_no_prot.result
+++ b/mysql-test/main/grant_cache_no_prot.result
@@ -154,7 +154,7 @@ a b c a
1 1 1 test.t1
2 2 2 test.t1
select * from t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysqltest`.`t2`
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 6
@@ -170,7 +170,7 @@ select "user3";
user3
user3
select * from t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest`.`t1`
select a from t1;
a
1
@@ -178,7 +178,7 @@ a
select c from t1;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'
select * from t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest`.`t2`
select mysqltest.t1.c from test.t1,mysqltest.t1;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'
show status like "Qcache_queries_in_cache";
diff --git a/mysql-test/main/grant_cache_ps_prot.result b/mysql-test/main/grant_cache_ps_prot.result
index 9dcf8c4aa8f..d6f343d6459 100644
--- a/mysql-test/main/grant_cache_ps_prot.result
+++ b/mysql-test/main/grant_cache_ps_prot.result
@@ -154,7 +154,7 @@ a b c a
1 1 1 test.t1
2 2 2 test.t1
select * from t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysqltest`.`t2`
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 6
@@ -170,7 +170,7 @@ select "user3";
user3
user3
select * from t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest`.`t1`
select a from t1;
a
1
@@ -178,7 +178,7 @@ a
select c from t1;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'
select * from t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest`.`t2`
select mysqltest.t1.c from test.t1,mysqltest.t1;
ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for column 'c' in table 't1'
show status like "Qcache_queries_in_cache";
diff --git a/mysql-test/main/grant_explain_non_select.result b/mysql-test/main/grant_explain_non_select.result
index 53b7d687d6c..8400b03ce9f 100644
--- a/mysql-test/main/grant_explain_non_select.result
+++ b/mysql-test/main/grant_explain_non_select.result
@@ -10,13 +10,13 @@ connect con1,localhost,privtest,,;
connection con1;
USE privtest_db;
EXPLAIN INSERT INTO t1 VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
INSERT INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT INSERT ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
@@ -32,36 +32,36 @@ connection default;
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
connection con1;
EXPLAIN REPLACE INTO t1 VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 VALUES (10);
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT, DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT INSERT ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
EXPLAIN REPLACE INTO t1 VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 VALUES (10);
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
REVOKE INSERT ON privtest_db.t1 FROM 'privtest'@'localhost';
GRANT DELETE ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
EXPLAIN REPLACE INTO t1 VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 VALUES (10);
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
REPLACE INTO t1 SELECT * FROM t2;
-ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT INSERT, DELETE ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
@@ -77,13 +77,13 @@ connection default;
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
connection con1;
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT UPDATE ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
@@ -100,13 +100,13 @@ REVOKE UPDATE ON privtest_db.t1 FROM 'privtest'@'localhost';
GRANT SELECT ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
EXPLAIN UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1 SET a = a + 1;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
UPDATE t1, t2 SET t1.a = t1.a + 1 WHERE t1.a = t2.a;
-ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: UPDATE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT UPDATE, SELECT ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
@@ -123,13 +123,13 @@ connection default;
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
connection con1;
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
GRANT DELETE ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
@@ -138,21 +138,21 @@ ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a'
DELETE FROM t1 WHERE a = 10;
ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for column 'a' in table 't1'
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
GRANT SELECT ON privtest_db.t1 TO 'privtest'@'localhost';
connection con1;
EXPLAIN DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 WHERE a = 10;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
EXPLAIN DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
DELETE FROM t1 USING t1, t2 WHERE t1.a = t2.a;
-ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'privtest'@'localhost' for table `privtest_db`.`t1`
connection default;
REVOKE ALL PRIVILEGES ON privtest_db.t1 FROM 'privtest'@'localhost';
GRANT DELETE, SELECT ON privtest_db.t1 TO 'privtest'@'localhost';
diff --git a/mysql-test/main/grant_lowercase_fs.result b/mysql-test/main/grant_lowercase_fs.result
index e883067eca0..413c3f482a6 100644
--- a/mysql-test/main/grant_lowercase_fs.result
+++ b/mysql-test/main/grant_lowercase_fs.result
@@ -6,12 +6,12 @@ GRANT SELECT ON db1.* to USER_1@localhost;
connect con1,localhost,user_1,,db1;
CREATE TABLE t1(f1 int);
SELECT * FROM t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `db1`.`t1`
connect con2,localhost,USER_1,,db1;
SELECT * FROM t1;
f1
CREATE TABLE t2(f1 int);
-ERROR 42000: CREATE command denied to user 'USER_1'@'localhost' for table 't2'
+ERROR 42000: CREATE command denied to user 'USER_1'@'localhost' for table `db1`.`t2`
connection default;
disconnect con1;
disconnect con2;
diff --git a/mysql-test/main/information_schema_db.result b/mysql-test/main/information_schema_db.result
index a724340e8aa..3b97b1a4c2d 100644
--- a/mysql-test/main/information_schema_db.result
+++ b/mysql-test/main/information_schema_db.result
@@ -161,17 +161,17 @@ use testdb_1;
revoke select,show view on v6 from testdb_2@localhost;
connection testdb_2;
show fields from testdb_1.v5;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v5`
show create view testdb_1.v5;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v5`
show fields from testdb_1.v6;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v6'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v6`
show create view testdb_1.v6;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v6'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v6`
show fields from testdb_1.v7;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v7'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v7`
show create view testdb_1.v7;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v7'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v7`
show create view v4;
View Create View character_set_client collation_connection
v4 CREATE ALGORITHM=UNDEFINED DEFINER=`testdb_2`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS select `v3`.`f1` AS `f1`,`v3`.`f2` AS `f2` from `testdb_1`.`v3` latin1 latin1_swedish_ci
@@ -189,7 +189,7 @@ show create view v2;
View Create View character_set_client collation_connection
v2 CREATE ALGORITHM=UNDEFINED DEFINER=`testdb_2`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `v1`.`f1` AS `f1` from `testdb_1`.`v1` latin1 latin1_swedish_ci
show create view testdb_1.v1;
-ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'testdb_2'@'localhost' for table `testdb_1`.`v1`
select table_name from information_schema.columns a
where a.table_name = 'v2';
table_name
@@ -236,7 +236,7 @@ where table_name='v1';
table_schema table_name view_definition
testdb_1 v1
show create view testdb_1.v1;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `testdb_1`.`v1`
connection default;
drop user mysqltest_1@localhost;
drop database testdb_1;
diff --git a/mysql-test/main/insert_notembedded.result b/mysql-test/main/insert_notembedded.result
index 8dd4aa7d71e..5df69cc8ffe 100644
--- a/mysql-test/main/insert_notembedded.result
+++ b/mysql-test/main/insert_notembedded.result
@@ -38,7 +38,7 @@ INNER JOIN view_stations AS stations
ON table_source.id = stations.icao
LEFT JOIN table_target AS old
USING (mexs_id);
-ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'table_target'
+ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table `meow`.`table_target`
REPLACE INTO view_target2
SELECT stations.mexs_id AS mexs_id, datetime AS messzeit
FROM table_source
@@ -46,7 +46,7 @@ INNER JOIN view_stations AS stations
ON table_source.id = stations.icao
LEFT JOIN view_target2 AS old
USING (mexs_id);
-ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'view_target2'
+ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table `meow`.`view_target2`
REPLACE INTO view_target3
SELECT stations.mexs_id AS mexs_id, datetime AS messzeit
FROM table_source
@@ -70,7 +70,7 @@ ON table_source.id = stations.icao
LEFT JOIN table_target AS old
USING (mexs_id);
REPLACE INTO table_target2 VALUES ('00X45Y78','2006-07-12 07:50:00');
-ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'table_target2'
+ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table `meow`.`table_target2`
REPLACE INTO view_target2 VALUES ('12X45Y78','2006-07-12 07:50:00');
SELECT stations.mexs_id AS mexs_id, datetime AS messzeit
FROM table_source
diff --git a/mysql-test/main/invisible_field_grant_completely.result b/mysql-test/main/invisible_field_grant_completely.result
index aa0a768c51c..b1b313072b2 100644
--- a/mysql-test/main/invisible_field_grant_completely.result
+++ b/mysql-test/main/invisible_field_grant_completely.result
@@ -51,9 +51,9 @@ connection default;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1;
connection con1;
select * from t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `d`.`t1`
select invisible from t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `d`.`t1`
disconnect con1;
#Final Cleanup
diff --git a/mysql-test/main/invisible_field_grant_system.result b/mysql-test/main/invisible_field_grant_system.result
index b69478c58b3..d2e40c391c4 100644
--- a/mysql-test/main/invisible_field_grant_system.result
+++ b/mysql-test/main/invisible_field_grant_system.result
@@ -57,9 +57,9 @@ connection default;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_1;
connection con1;
select * from t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `d`.`t1`
select count(row_start) from t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `d`.`t1`
disconnect con1;
#Cleanup
diff --git a/mysql-test/main/lowercase_fs_off.result b/mysql-test/main/lowercase_fs_off.result
index 3f0b08a78c4..168d5f53c16 100644
--- a/mysql-test/main/lowercase_fs_off.result
+++ b/mysql-test/main/lowercase_fs_off.result
@@ -27,7 +27,7 @@ CREATE TABLE t1(f1 INT);
GRANT SELECT ON T1 to user_1@localhost;
connect con1,localhost,user_1,,d1;
select * from t1;
-ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_1'@'localhost' for table `d1`.`t1`
select * from T1;
f1
connection default;
diff --git a/mysql-test/main/mysqlbinlog.result b/mysql-test/main/mysqlbinlog.result
index 4c82563e0f6..02aea1c1e45 100644
--- a/mysql-test/main/mysqlbinlog.result
+++ b/mysql-test/main/mysqlbinlog.result
@@ -666,7 +666,7 @@ connect unsecure,localhost,untrusted,,mysqltest1;
mysql mysqltest1 -uuntrusted < var/tmp/bug31611.sql
connection unsecure;
INSERT INTO t1 VALUES (1,USER());
-ERROR 42000: INSERT command denied to user 'untrusted'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'untrusted'@'localhost' for table `mysqltest1`.`t1`
SELECT * FROM t1;
a b
1 root@localhost
diff --git a/mysql-test/main/openssl_1.result b/mysql-test/main/openssl_1.result
index a9c092948be..64672655ebe 100644
--- a/mysql-test/main/openssl_1.result
+++ b/mysql-test/main/openssl_1.result
@@ -22,7 +22,7 @@ select * from t1;
f1
5
delete from t1;
-ERROR 42000: DELETE command denied to user 'ssl_user1'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'ssl_user1'@'localhost' for table `test`.`t1`
connection con3;
SELECT VARIABLE_VALUE <> '' AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
have_ssl
@@ -31,7 +31,7 @@ select * from t1;
f1
5
delete from t1;
-ERROR 42000: DELETE command denied to user 'ssl_user3'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'ssl_user3'@'localhost' for table `test`.`t1`
connection con4;
SELECT VARIABLE_VALUE <> '' AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher';
have_ssl
@@ -40,7 +40,7 @@ select * from t1;
f1
5
delete from t1;
-ERROR 42000: DELETE command denied to user 'ssl_user4'@'localhost' for table 't1'
+ERROR 42000: DELETE command denied to user 'ssl_user4'@'localhost' for table `test`.`t1`
connection default;
disconnect con1;
disconnect con3;
diff --git a/mysql-test/main/partition_grant.result b/mysql-test/main/partition_grant.result
index 41934896aeb..c269896975d 100644
--- a/mysql-test/main/partition_grant.result
+++ b/mysql-test/main/partition_grant.result
@@ -14,7 +14,7 @@ GRANT USAGE ON *.* TO `mysqltest_1`@`localhost`
GRANT SELECT, ALTER ON `mysqltest_1`.* TO `mysqltest_1`@`localhost`
alter table t1 add b int;
alter table t1 drop partition p2;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `mysqltest_1`.`t1`
disconnect conn1;
connection default;
grant drop on mysqltest_1.* to mysqltest_1@localhost;
@@ -25,7 +25,7 @@ connection default;
revoke alter on mysqltest_1.* from mysqltest_1@localhost;
connect conn3,localhost,mysqltest_1,,mysqltest_1;
alter table t1 drop partition p3;
-ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table `mysqltest_1`.`t1`
disconnect conn3;
connection default;
revoke select,alter,drop on mysqltest_1.* from mysqltest_1@localhost;
diff --git a/mysql-test/main/plugin_not_embedded.result b/mysql-test/main/plugin_not_embedded.result
index 84e47b4a4bc..490dd2a0423 100644
--- a/mysql-test/main/plugin_not_embedded.result
+++ b/mysql-test/main/plugin_not_embedded.result
@@ -6,7 +6,7 @@ GRANT INSERT ON mysql.plugin TO bug51770@localhost;
connect con1,localhost,bug51770,,;
INSTALL PLUGIN example SONAME 'ha_example.so';
UNINSTALL PLUGIN example;
-ERROR 42000: DELETE command denied to user 'bug51770'@'localhost' for table 'plugin'
+ERROR 42000: DELETE command denied to user 'bug51770'@'localhost' for table `mysql`.`plugin`
connection default;
GRANT DELETE ON mysql.plugin TO bug51770@localhost;
connection con1;
diff --git a/mysql-test/main/ps_grant.result b/mysql-test/main/ps_grant.result
index ab21c198b98..88410d6c83c 100644
--- a/mysql-test/main/ps_grant.result
+++ b/mysql-test/main/ps_grant.result
@@ -28,7 +28,7 @@ execute s_t9 ;
my_col
1
select a as my_col from t1;
-ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table `mysqltest`.`t1`
connection default;
grant select on mysqltest.t1 to second_user@localhost
identified by 'looser' ;
@@ -71,7 +71,7 @@ Grants for second_user@localhost
GRANT USAGE ON *.* TO `second_user`@`localhost` IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
GRANT SELECT ON `mysqltest`.`t9` TO `second_user`@`localhost`
execute s_t1 ;
-ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table `mysqltest`.`t1`
connection default;
disconnect con3;
revoke all privileges, grant option from second_user@localhost ;
diff --git a/mysql-test/main/show_check.result b/mysql-test/main/show_check.result
index e5f6bff04e8..47e3ae9189a 100644
--- a/mysql-test/main/show_check.result
+++ b/mysql-test/main/show_check.result
@@ -535,25 +535,25 @@ show create database mysqltest;
Database Create Database
mysqltest CREATE DATABASE `mysqltest` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */
drop table t1;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t1`
drop database mysqltest;
ERROR 42000: Access denied for user 'mysqltest_1'@'localhost' to database 'mysqltest'
disconnect con1;
connect con2,localhost,mysqltest_2,,test;
connection con2;
select * from mysqltest.t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table `mysqltest`.`t1`
show create database mysqltest;
ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'mysqltest'
drop table mysqltest.t1;
-ERROR 42000: DROP command denied to user 'mysqltest_2'@'localhost' for table 't1'
+ERROR 42000: DROP command denied to user 'mysqltest_2'@'localhost' for table `mysqltest`.`t1`
drop database mysqltest;
ERROR 42000: Access denied for user 'mysqltest_2'@'localhost' to database 'mysqltest'
disconnect con2;
connect con3,localhost,mysqltest_3,,test;
connection con3;
select * from mysqltest.t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_3'@'localhost' for table `mysqltest`.`t1`
show create database mysqltest;
Database Create Database
mysqltest CREATE DATABASE `mysqltest` /*!40100 DEFAULT CHARACTER SET latin1 COLLATE latin1_swedish_ci */
diff --git a/mysql-test/main/sp-security-anchor-type.result b/mysql-test/main/sp-security-anchor-type.result
index 4ee846f9f2e..12e3c0fa24e 100644
--- a/mysql-test/main/sp-security-anchor-type.result
+++ b/mysql-test/main/sp-security-anchor-type.result
@@ -21,9 +21,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 OF with a table we don't have access to
#
@@ -39,7 +39,7 @@ SET NEW.b = 10;
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
@@ -56,7 +56,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;
#
# Stored procedure: Using TYPE OF for with a table that we don't have access to
@@ -72,7 +72,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()
@@ -84,7 +84,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 OF for with a table that we don't have access to
@@ -129,7 +129,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;
#
@@ -147,7 +147,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;
#
@@ -176,7 +176,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/main/sp-security.result b/mysql-test/main/sp-security.result
index 1dea23a5271..5df70242c15 100644
--- a/mysql-test/main/sp-security.result
+++ b/mysql-test/main/sp-security.result
@@ -50,7 +50,7 @@ select db1_secret.db();
db1_secret.db()
test
select * from db1_secret.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_secret`.`t1`
create procedure db1_secret.dummy() begin end;
ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'
drop procedure db1_secret.dummy;
@@ -65,7 +65,7 @@ select db1_secret.db();
db1_secret.db()
test
select * from db1_secret.t1;
-ERROR 42000: SELECT command denied to user ''@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user ''@'localhost' for table `db1_secret`.`t1`
create procedure db1_secret.dummy() begin end;
ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'
drop procedure db1_secret.dummy;
@@ -102,14 +102,14 @@ db()
test
connection con2user1;
call db1_secret.stamp(5);
-ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table `db1_secret`.`t1`
select db1_secret.db();
-ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user1'@'localhost' for table `db1_secret`.`t1`
connection con3anon;
call db1_secret.stamp(6);
-ERROR 42000: INSERT command denied to user ''@'localhost' for table 't1'
+ERROR 42000: INSERT command denied to user ''@'localhost' for table `db1_secret`.`t1`
select db1_secret.db();
-ERROR 42000: SELECT command denied to user ''@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user ''@'localhost' for table `db1_secret`.`t1`
connection con1root;
drop database if exists db2;
create database db2;
@@ -127,7 +127,7 @@ connection con2user1;
use db2;
create procedure p () insert into t2 values (1);
call p();
-ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table 't2'
+ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table `db2`.`t2`
connect con4user2,localhost,user2,,;
connection con4user2;
use db2;
@@ -404,9 +404,9 @@ id int(11) YES NULL
call db_bug14533.bug14533_2();
id
desc db_bug14533.t1;
-ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table `db_bug14533`.`t1`
select * from db_bug14533.t1;
-ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'user_bug14533'@'localhost' for table `db_bug14533`.`t1`
connection default;
disconnect user_bug14533;
drop user user_bug14533@localhost;
@@ -566,24 +566,24 @@ END|
CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT f_evil();
connect conn1, localhost, mysqltest_u1,,;
SELECT COUNT(*) FROM t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `test`.`t1`
SELECT f_evil();
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `test`.`t1`
SELECT @a, @b;
@a @b
mysqltest_u1@localhost NULL
SELECT f_suid(f_evil());
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `test`.`t1`
SELECT @a, @b;
@a @b
mysqltest_u1@localhost NULL
CALL p_suid(f_evil());
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `test`.`t1`
SELECT @a, @b;
@a @b
mysqltest_u1@localhost NULL
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for table `test`.`v1`
SELECT @a, @b;
@a @b
mysqltest_u1@localhost NULL
diff --git a/mysql-test/main/status.result b/mysql-test/main/status.result
index 688d8acee1a..0f2324e4301 100644
--- a/mysql-test/main/status.result
+++ b/mysql-test/main/status.result
@@ -243,13 +243,13 @@ return (select * from db37908.t1 limit 1)|
connect user1,localhost,mysqltest_1,,test;
connection user1;
select * from db37908.t1;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `db37908`.`t1`
show status where variable_name ='uptime' and 2 in (select * from db37908.t1);
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `db37908`.`t1`
show procedure status where name ='proc37908' and 1 in (select f1 from db37908.t1);
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `db37908`.`t1`
show function status where name ='func37908' and 1 in (select func37908());
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `db37908`.`t1`
connection default;
disconnect user1;
disconnect root;
diff --git a/mysql-test/main/timezone_grant.result b/mysql-test/main/timezone_grant.result
index bacc8348e89..6d9872448a7 100644
--- a/mysql-test/main/timezone_grant.result
+++ b/mysql-test/main/timezone_grant.result
@@ -25,9 +25,9 @@ convert_tz(b, 'Europe/Moscow', 'UTC')
update t1, t2 set t1.b = convert_tz('2004-10-21 19:00:00', 'Europe/Moscow', 'UTC')
where t1.a = t2.c and t2.d = (select max(d) from t2);
select * from mysql.time_zone_name;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone_name`
select Name, convert_tz('2004-10-21 19:00:00', Name, 'UTC') from mysql.time_zone_name;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone_name`
connection default;
disconnect tzuser;
connection default;
@@ -54,9 +54,9 @@ convert_tz(b, 'Europe/Moscow', 'UTC')
update t1, t2 set t1.b = convert_tz('2004-11-30 12:00:00', 'Europe/Moscow', 'UTC')
where t1.a = t2.c and t2.d = (select max(d) from t2);
select * from mysql.time_zone_name;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone_name`
select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone_name`
drop table t1, t2;
create table t1 (a int, b datetime);
create table t2 (a int, b varchar(40));
@@ -82,10 +82,10 @@ a lb
1 2001-01-01 03:00:00
2 2002-01-01 03:00:00
select * from v1, mysql.time_zone;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone`
drop view v1;
create view v1 as select a, convert_tz(b, 'UTC', 'Europe/Moscow') as lb from t1, mysql.time_zone;
-ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for table 'time_zone'
+ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for table `mysql`.`time_zone`
connection default;
disconnect tzuser3;
drop table t1;
diff --git a/mysql-test/main/trigger_notembedded.result b/mysql-test/main/trigger_notembedded.result
index 94e651b1340..1d27b4197da 100644
--- a/mysql-test/main/trigger_notembedded.result
+++ b/mysql-test/main/trigger_notembedded.result
@@ -23,7 +23,7 @@ connection wl2818_definer_con;
CREATE TRIGGER trg1 AFTER INSERT ON t1
FOR EACH ROW
INSERT INTO t2 VALUES(CURRENT_USER());
-ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table `mysqltest_db1`.`t1`
disconnect wl2818_definer_con;
connection default;
GRANT TRIGGER ON mysqltest_db1.t1 TO mysqltest_dfn@localhost;
@@ -38,12 +38,12 @@ REVOKE TRIGGER ON mysqltest_db1.t1 FROM mysqltest_dfn@localhost;
connect wl2818_definer_con,localhost,mysqltest_dfn,,mysqltest_db1;
connection wl2818_definer_con;
DROP TRIGGER trg1;
-ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table `mysqltest_db1`.`t1`
disconnect wl2818_definer_con;
connect wl2818_definer_con,localhost,mysqltest_dfn,,mysqltest_db1;
connection wl2818_definer_con;
INSERT INTO t1 VALUES(0);
-ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'mysqltest_dfn'@'localhost' for table `mysqltest_db1`.`t1`
disconnect wl2818_definer_con;
connection default;
GRANT TRIGGER ON mysqltest_db1.t1 TO mysqltest_dfn@localhost;
@@ -95,7 +95,7 @@ REVOKE INSERT ON mysqltest_db1.t2 FROM mysqltest_dfn@localhost;
connection wl2818_invoker_con;
use mysqltest_db1;
INSERT INTO t1 VALUES(3);
-ERROR 42000: INSERT command denied to user 'mysqltest_dfn'@'localhost' for table 't2'
+ERROR 42000: INSERT command denied to user 'mysqltest_dfn'@'localhost' for table `mysqltest_db1`.`t2`
SELECT * FROM t1;
num_value
1
@@ -563,7 +563,7 @@ INSERT INTO t2 VALUES (2);
connection default;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_u1@localhost;
UPDATE IGNORE t1, t2 SET t1.a1 = 2, t2.a1 = 3 WHERE t1.a1 = 1 AND t2.a1 = 2;
-ERROR 42000: TRIGGER command denied to user 'mysqltest_u1'@'localhost' for table 't1'
+ERROR 42000: TRIGGER command denied to user 'mysqltest_u1'@'localhost' for table `mysqltest_db1`.`t1`
DROP DATABASE mysqltest_db1;
DROP USER mysqltest_u1@localhost;
disconnect con1;
diff --git a/mysql-test/main/view_grant.result b/mysql-test/main/view_grant.result
index 00a93488919..a5e183952c6 100644
--- a/mysql-test/main/view_grant.result
+++ b/mysql-test/main/view_grant.result
@@ -25,13 +25,13 @@ create definer=root@localhost view v1 as select * from mysqltest.t1;
ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
create view v1 as select * from mysqltest.t1;
alter view v1 as select * from mysqltest.t1;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `test`.`v1`
create or replace view v1 as select * from mysqltest.t1;
-ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: DROP command denied to user 'mysqltest_1'@'localhost' for table `test`.`v1`
create view mysqltest.v2 as select * from mysqltest.t1;
-ERROR 42000: CREATE VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: CREATE VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
create view v2 as select * from mysqltest.t2;
-ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`t2`
connection root;
show create view v1;
View Create View character_set_client collation_connection
@@ -98,7 +98,7 @@ c
select c from mysqltest.v4;
c
select c from mysqltest.v5;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v5`
show columns from mysqltest.v1;
Field Type Null Key Default Extra
c bigint(12) YES NULL
@@ -110,23 +110,23 @@ d bigint(12) YES NULL
explain select c from mysqltest.v1;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v1`
explain select c from mysqltest.v2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v2;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
explain select c from mysqltest.v3;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v3;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v3'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3`
explain select c from mysqltest.v4;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v4;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v4'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v4`
explain select c from mysqltest.v5;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v5`
show create view mysqltest.v5;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v5`
connection root;
grant select on mysqltest.v5 to mysqltest_1@localhost;
connection user1;
@@ -136,7 +136,7 @@ v5 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
explain select c from mysqltest.v1;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v1`
connection root;
grant show view on mysqltest.v1 to mysqltest_1@localhost;
grant select on mysqltest.t1 to mysqltest_1@localhost;
@@ -151,17 +151,17 @@ v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
explain select c from mysqltest.v2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v2;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
explain select c from mysqltest.v3;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v3;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v3'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3`
explain select c from mysqltest.v4;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
show create view mysqltest.v4;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v4'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v4`
explain select c from mysqltest.v5;
-ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v5'
+ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v5`
connection root;
grant show view on mysqltest.* to mysqltest_1@localhost;
connection user1;
@@ -248,9 +248,9 @@ ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for column
update v2 set c=a+c;
ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for column 'c' in table 'v2'
update t2,v3 set v3.a=v3.a+v3.c where t2.x=v3.c;
-ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table 'v3'
+ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3`
update v3 set a=a+c;
-ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table 'v3'
+ERROR 42000: UPDATE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v3`
use test;
connection root;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
@@ -281,9 +281,9 @@ select * from t1;
a b
5 10
delete v2 from t2,v2 where t2.x=v2.c;
-ERROR 42000: DELETE command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
delete from v2 where c < 4;
-ERROR 42000: DELETE command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: DELETE command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
use test;
connection root;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
@@ -316,9 +316,9 @@ a b
5 6
3 4
insert into v2 values (5,6);
-ERROR 42000: INSERT command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
insert into v2 select x,y from t2;
-ERROR 42000: INSERT command denied to user 'mysqltest_1'@'localhost' for table 'v2'
+ERROR 42000: INSERT command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v2`
use test;
connection root;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_1@localhost;
@@ -336,7 +336,7 @@ connection user1;
create view v1 as select * from mysqltest.t1;
create view v2 as select b from mysqltest.t2;
create view mysqltest.v1 as select * from mysqltest.t1;
-ERROR 42000: CREATE VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: CREATE VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v1`
create view v3 as select a from mysqltest.t2;
ERROR 42000: ANY command denied to user 'mysqltest_1'@'localhost' for column 'a' in table 't2'
connection root;
@@ -609,7 +609,7 @@ connection user1;
use mysqltest;
LOCK TABLES v1 READ;
SHOW CREATE TABLE v1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table `mysqltest`.`v1`
UNLOCK TABLES;
use test;
connection root;
@@ -668,29 +668,29 @@ ERROR HY000: View 'mysqltest1.v_t1' references invalid table(s) or column(s) or
SELECT 1 FROM mysqltest1.v_t1;
ERROR HY000: View 'mysqltest1.v_t1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
SELECT * FROM mysqltest1.t1;
-ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table `mysqltest1`.`t1`
SELECT * FROM mysqltest1.v_ts;
x
1
2
SELECT * FROM mysqltest1.v_ts, mysqltest1.t1 WHERE mysqltest1.t1.x = mysqltest1.v_ts.x;
-ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table `mysqltest1`.`t1`
SELECT * FROM mysqltest1.v_ti;
-ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table 'v_ti'
+ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ti`
INSERT INTO mysqltest1.v_ts VALUES (100);
-ERROR 42000: INSERT command denied to user 'readonly'@'localhost' for table 'v_ts'
+ERROR 42000: INSERT command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ts`
INSERT INTO mysqltest1.v_ti VALUES (100);
UPDATE mysqltest1.v_ts SET x= 200 WHERE x = 100;
-ERROR 42000: UPDATE command denied to user 'readonly'@'localhost' for table 'v_ts'
+ERROR 42000: UPDATE command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ts`
UPDATE mysqltest1.v_ts SET x= 200;
-ERROR 42000: UPDATE command denied to user 'readonly'@'localhost' for table 'v_ts'
+ERROR 42000: UPDATE command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ts`
UPDATE mysqltest1.v_tu SET x= 200 WHERE x = 100;
UPDATE mysqltest1.v_tus SET x= 200 WHERE x = 100;
UPDATE mysqltest1.v_tu SET x= 200;
DELETE FROM mysqltest1.v_ts WHERE x= 200;
-ERROR 42000: DELETE command denied to user 'readonly'@'localhost' for table 'v_ts'
+ERROR 42000: DELETE command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ts`
DELETE FROM mysqltest1.v_ts;
-ERROR 42000: DELETE command denied to user 'readonly'@'localhost' for table 'v_ts'
+ERROR 42000: DELETE command denied to user 'readonly'@'localhost' for table `mysqltest1`.`v_ts`
DELETE FROM mysqltest1.v_td WHERE x= 200;
ERROR 42000: SELECT command denied to user 'readonly'@'localhost' for column 'x' in table 'v_td'
DELETE FROM mysqltest1.v_tds WHERE x= 200;
@@ -842,7 +842,7 @@ connect inv,localhost,inv_17254,,db17254;
connection inv;
for a user
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'inv_17254'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'inv_17254'@'localhost' for table `db17254`.`v1`
connection root;
for a superuser
SELECT * FROM v1;
@@ -886,11 +886,11 @@ REVOKE SELECT ON t2 FROM mysqltest_u2@localhost;
UPDATE t2 SET s = 'private' WHERE s = 'public';
connection conn2;
SELECT * FROM mysqltest_db1.v1, mysqltest_db1.t2;
-ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table `mysqltest_db1`.`t2`
EXECUTE stmt1;
-ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table `mysqltest_db1`.`t2`
EXECUTE stmt2;
-ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'mysqltest_u2'@'localhost' for table `mysqltest_db1`.`t2`
disconnect conn2;
disconnect conn1;
connection default;
@@ -915,9 +915,9 @@ GRANT SELECT ON db26813.t1 TO u26813@localhost;
connect u1,localhost,u26813,,db26813;
connection u1;
ALTER VIEW v1 AS SELECT f2 FROM t1;
-ERROR 42000: CREATE VIEW command denied to user 'u26813'@'localhost' for table 'v1'
+ERROR 42000: CREATE VIEW command denied to user 'u26813'@'localhost' for table `db26813`.`v1`
ALTER VIEW v2 AS SELECT f2 FROM t1;
-ERROR 42000: DROP command denied to user 'u26813'@'localhost' for table 'v2'
+ERROR 42000: DROP command denied to user 'u26813'@'localhost' for table `db26813`.`v2`
ALTER VIEW v3 AS SELECT f2 FROM t1;
ERROR 42000: Access denied; you need (at least one of) the SUPER privilege(s) for this operation
connection root;
@@ -1080,13 +1080,13 @@ f1
SELECT f2 FROM t1;
ERROR 42000: SELECT command denied to user 'foo'@'localhost' for column 'f2' in table '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 `db1`.`t1`
SELECT f1 FROM v1;
f1
SELECT f2 FROM v1;
ERROR 42000: SELECT command denied to user 'foo'@'localhost' for column 'f2' in table 'v1'
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'foo'@'localhost' for table `db1`.`v1`
connection default;
disconnect root;
disconnect addconfoo;
@@ -1183,9 +1183,9 @@ disconnect test11765687;
connect test11765687,localhost,cecil,,mysqltest1;
connection test11765687;
select * from v1;
-ERROR 42000: SELECT command denied to user 'cecil'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'cecil'@'localhost' for table `mysqltest1`.`v1`
explain select * from v1;
-ERROR 42000: SELECT command denied to user 'cecil'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'cecil'@'localhost' for table `mysqltest1`.`v1`
disconnect test11765687;
... as dan
connect test11765687,localhost,dan,,mysqltest1;
@@ -1213,11 +1213,11 @@ show create view v2;
View Create View character_set_client collation_connection
v2 CREATE ALGORITHM=UNDEFINED DEFINER=`alice`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `v1`.`i` AS `i`,`t2`.`j` AS `j` from (`v1` join `t2`) latin1 latin1_swedish_ci
explain select * from t1;
-ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table 't1'
+ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table `mysqltest1`.`t1`
explain select * from v1;
-ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table `mysqltest1`.`v1`
explain select * from t2;
-ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table 't2'
+ERROR 42000: SELECT command denied to user 'fiona'@'localhost' for table `mysqltest1`.`t2`
explain select * from v2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
disconnect test11765687;
@@ -1227,7 +1227,7 @@ connection test11765687;
select * from v2;
i j
explain select * from v1;
-ERROR 42000: SELECT command denied to user 'greg'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'greg'@'localhost' for table `mysqltest1`.`v1`
explain select * from v2;
ERROR HY000: ANALYZE/EXPLAIN/SHOW can not be issued; lacking privileges for underlying table
disconnect test11765687;
@@ -1235,9 +1235,9 @@ disconnect test11765687;
connect test11765687,localhost,han,,mysqltest1;
connection test11765687;
select * from t3;
-ERROR 42000: SELECT command denied to user 'han'@'localhost' for table 't3'
+ERROR 42000: SELECT command denied to user 'han'@'localhost' for table `mysqltest1`.`t3`
explain select * from t3;
-ERROR 42000: SELECT command denied to user 'han'@'localhost' for table 't3'
+ERROR 42000: SELECT command denied to user 'han'@'localhost' for table `mysqltest1`.`t3`
select k from t3;
k
explain select k from t3;
@@ -1277,9 +1277,9 @@ disconnect test11765687;
connect test11765687,localhost,lena,,mysqltest1;
connection test11765687;
select * from v2;
-ERROR 42000: SELECT command denied to user 'lena'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'lena'@'localhost' for table `mysqltest1`.`v2`
explain select * from v2;
-ERROR 42000: SELECT command denied to user 'lena'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'lena'@'localhost' for table `mysqltest1`.`v2`
disconnect test11765687;
... as mhairi
connect test11765687,localhost,mhairi,,mysqltest1;
@@ -1397,9 +1397,9 @@ connect connection1, localhost, mysqluser1, , mysqltest1;
This would lead to failed assertion.
CREATE VIEW v1 AS SELECT a, b FROM t1, t2;
SELECT * FROM v1;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v1`
SELECT b FROM v1;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v1`
disconnect connection1;
connection default;
DROP TABLE t1, t2;
@@ -1418,9 +1418,9 @@ GRANT SELECT( a ) ON v1 TO mysqluser1@localhost;
GRANT UPDATE( b ) ON t2 TO mysqluser1@localhost;
connect connection1, localhost, mysqluser1, , test;
SELECT * FROM mysqltest1.v1;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v1`
CREATE VIEW v1 AS SELECT * FROM mysqltest1.t2;
-ERROR 42000: ANY command denied to user 'mysqluser1'@'localhost' for table 't2'
+ERROR 42000: ANY command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`t2`
disconnect connection1;
connection default;
DROP TABLE t1, t2;
@@ -1443,9 +1443,9 @@ connection default;
REVOKE SELECT ON mysqltest1.* FROM mysqluser1@localhost;
connection connection1;
EXECUTE stmt_v1;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v1'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v1`
EXECUTE stmt_v2;
-ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table 'v2'
+ERROR 42000: SELECT command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v2`
disconnect connection1;
connect connection2, localhost, mysqluser1,,;
PREPARE stmt FROM "SELECT a FROM v3";
@@ -1605,11 +1605,11 @@ REVOKE SHOW VIEW ON v_f1 FROM mysqluser1@localhost;
REVOKE SHOW VIEW ON v_v1 FROM mysqluser1@localhost;
connection connection1;
SHOW CREATE VIEW mysqltest1.v_t1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table 'v_t1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v_t1`
SHOW CREATE VIEW mysqltest1.v_f1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table 'v_f1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v_f1`
SHOW CREATE VIEW mysqltest1.v_v1;
-ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table 'v_v1'
+ERROR 42000: SHOW VIEW command denied to user 'mysqluser1'@'localhost' for table `mysqltest1`.`v_v1`
SHOW CREATE VIEW v_mysqluser1_t1;
View Create View character_set_client collation_connection
v_mysqluser1_t1 CREATE ALGORITHM=UNDEFINED DEFINER=`mysqluser1`@`localhost` SQL SECURITY DEFINER VIEW `v_mysqluser1_t1` AS select `mysqltest1`.`t1`.`a` AS `a` from `mysqltest1`.`t1` latin1 latin1_swedish_ci
@@ -1860,7 +1860,7 @@ update mysqltest2.t2 as t2, mysqltest1.v1_temp as v1 set t2.val= 'test4'
# Temptable views can't be updated.
update mysqltest2.t2 as t2, mysqltest1.v1_merge as v1 set v1.val= 'test5'
where t2.id= v1.id;
-ERROR 42000: UPDATE command denied to user 'user_11766767'@'localhost' for table 'v1_merge'
+ERROR 42000: UPDATE command denied to user 'user_11766767'@'localhost' for table `mysqltest1`.`v1_merge`
update mysqltest1.t1 as t1, mysqltest2.v2_merge as v2 set v2.val= 'test6'
where t1.id= v2.id;
#
@@ -1884,7 +1884,7 @@ update mysqltest2.t2 as t2, mysqltest1.v11_temp as v11 set t2.val= 'test10'
# on a view.
update mysqltest2.t2 as t2, mysqltest1.v11_merge as v11 set v11.val= 'test11'
where t2.id= v11.id;
-ERROR 42000: UPDATE command denied to user 'user_11766767'@'localhost' for table 'v11_merge'
+ERROR 42000: UPDATE command denied to user 'user_11766767'@'localhost' for table `mysqltest1`.`v11_merge`
update mysqltest1.t1 as t1, mysqltest2.v21_merge as v21 set v21.val= 'test12'
where t1.id= v21.id;
# As before, temptable views are not updateable.
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/engines/funcs/r/rpl_sp.result b/mysql-test/suite/engines/funcs/r/rpl_sp.result
index 0e5929bcbd7..4202c849e4e 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 9f9bf1ca4de..8e8606c6754 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 c869b5cc5bc..48ad0c8d05f 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 52afcb3cf28..cc22ec442d8 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 3c1cd61c1d0..37765a7bb04 100644
--- a/mysql-test/suite/funcs_1/r/is_table_constraints.result
+++ b/mysql-test/suite/funcs_1/r/is_table_constraints.result
@@ -150,7 +150,7 @@ t1 0 my_idx1 1 f6 ### ### ### ### ### ### ###
t1 0 my_idx1 2 f1 ### ### ### ### ### ### ###
t1 0 my_idx2 1 f3 ### ### ### ### ### ### ###
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 98f3810c950..54fef2f2cf8 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 b35d7c0bb2a..3b939c4c81b 100644
--- a/mysql-test/suite/funcs_1/r/is_user_privileges.result
+++ b/mysql-test/suite/funcs_1/r/is_user_privileges.result
@@ -1052,7 +1052,7 @@ PRIVILEGE_TYPE UPDATE
IS_GRANTABLE NO
SELECT * FROM mysql.user
WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'testuser2'@'localhost' for table `mysql`.`user`
SHOW GRANTS;
Grants for testuser2@localhost
GRANT INSERT, UPDATE ON *.* TO `testuser2`@`localhost`
@@ -1066,7 +1066,7 @@ PRIVILEGE_TYPE USAGE
IS_GRANTABLE NO
SELECT * FROM mysql.user
WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser3'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'testuser3'@'localhost' for table `mysql`.`user`
SHOW GRANTS;
Grants for testuser3@localhost
GRANT USAGE ON *.* TO `testuser3`@`localhost`
@@ -1246,12 +1246,12 @@ PRIVILEGE_TYPE USAGE
IS_GRANTABLE NO
SELECT * FROM mysql.user
WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `mysql`.`user`
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;
@@ -1261,12 +1261,12 @@ PRIVILEGE_TYPE USAGE
IS_GRANTABLE NO
SELECT * FROM mysql.user
WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `mysql`.`user`
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.user) to testuser1;
connection default;
@@ -1591,7 +1591,7 @@ GRANT USAGE ON *.* TO `testuser1`@`localhost`
GRANT ALL PRIVILEGES ON `db_datadict`.* TO `testuser1`@`localhost` WITH GRANT OPTION
GRANT SELECT ON `mysql`.`user` 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%'''
@@ -1926,7 +1926,7 @@ PRIVILEGE_TYPE USAGE
IS_GRANTABLE NO
SELECT * FROM mysql.user
WHERE user LIKE 'testuser%' ORDER BY host, user;
-ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table 'user'
+ERROR 42000: SELECT command denied to user 'testuser1'@'localhost' for table `mysql`.`user`
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 75286115d86..6b9c6c8ddc3 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 72c269cb89a..a72a8a1221d 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 75286115d86..6b9c6c8ddc3 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 8b8df4bd694..f6bd346cabe 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 37a422f219a..fabf9e6d41f 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 7d6c57e8131..b23ff238b8f 100644
--- a/mysql-test/suite/galera/r/galera_roles.result
+++ b/mysql-test/suite/galera/r/galera_roles.result
@@ -31,7 +31,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;
@@ -49,7 +49,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
@@ -67,7 +67,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;
@@ -85,7 +85,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
@@ -122,11 +122,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`
@@ -144,11 +144,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 a7ec431657b..e3d2f739104 100644
--- a/mysql-test/suite/galera/r/rename.result
+++ b/mysql-test/suite/galera/r/rename.result
@@ -21,7 +21,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/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 5e45a4cd900..d8cb33960e1 100644
--- a/mysql-test/suite/perfschema/r/connect_attrs.result
+++ b/mysql-test/suite/perfschema/r/connect_attrs.result
@@ -40,10 +40,10 @@ COUNT(DISTINCT PROCESSLIST_ID)
connection non_privileged_user;
SELECT COUNT(DISTINCT PROCESSLIST_ID)
FROM performance_schema.session_account_connect_attrs;
-ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table 'session_account_connect_attrs'
+ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table `performance_schema`.`session_account_connect_attrs`
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_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_events_stages_current.result b/mysql-test/suite/perfschema/r/dml_events_stages_current.result
index 326f87644ea..3b77c0cb1d0 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 b00963e5bd9..8b9d89871c7 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 9c20113b2af..812f7dac2ec 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 5f3b0f221c0..d130ffc4c2c 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 f5f77bfdfb5..cebfa24b461 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 e8b58122b16..092b4e9030c 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_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 3ecbc18c0ad..9252feb8bce 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_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_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_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_setup_consumers.result b/mysql-test/suite/perfschema/r/dml_setup_consumers.result
index c8d4515583e..769ab42be8f 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_consumers.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_consumers.result
@@ -36,17 +36,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 63e3bc20adb..4418fb30fdc 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
@@ -54,7 +54,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
@@ -66,10 +66,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 9dcc7f8e1c6..db54b03d09a 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_timers.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_timers.result
@@ -22,7 +22,7 @@ NAME TIMER_NAME
wait CYCLE
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
@@ -37,10 +37,10 @@ statement MILLISECOND
update performance_schema.setup_timers
set timer_name='CYCLE';
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_threads.result b/mysql-test/suite/perfschema/r/dml_threads.result
index a5fcc80f944..77a4a88b1f8 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/misc.result b/mysql-test/suite/perfschema/r/misc.result
index 2e4d21d625a..fb1710446e0 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 0a038000536..57986b269d4 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 3474b678321..e0a2490e9f2 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/roles/definer.result b/mysql-test/suite/roles/definer.result
index 70dabd50617..14ba1a6cea3 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 05ac5c95e31..e0a05e4c45e 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 de5f79d98f5..0ae1a8dd963 100644
--- a/mysql-test/suite/roles/roles_tables_priv-29465.result
+++ b/mysql-test/suite/roles/roles_tables_priv-29465.result
@@ -16,7 +16,7 @@ Host Db User Table_name Grantor Timestamp Table_priv Column_priv
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;
@@ -24,10 +24,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 fbfb9369cae..ed2144958b2 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 4c8163b7459..6e376d3c4a5 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`
insert ignore into mysql.user (user, host) values ('someuser', 'somehost');
Warnings:
Warning 1364 Field 'ssl_cipher' doesn't have a default value
@@ -59,7 +59,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;
delete from mysql.user where user = 'someuser' && host = 'somehost';
diff --git a/mysql-test/suite/roles/set_default_role_invalid.result b/mysql-test/suite/roles/set_default_role_invalid.result
index ffe8689e715..7e8b6cd9a64 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 997ea46624c..3455ebd79cb 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 c919a800220..41be75598b2 100644
--- a/mysql-test/suite/roles/set_role-database-recursive.result
+++ b/mysql-test/suite/roles/set_role-database-recursive.result
@@ -23,7 +23,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
@@ -43,7 +43,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()
@@ -61,7 +61,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 e21a55edf2e..3b28a908d3a 100644
--- a/mysql-test/suite/roles/set_role-database-simple.result
+++ b/mysql-test/suite/roles/set_role-database-simple.result
@@ -13,7 +13,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
@@ -26,7 +26,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;
@@ -37,13 +37,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 d1378f327a8..823b7cb534a 100644
--- a/mysql-test/suite/roles/set_role-recursive.result
+++ b/mysql-test/suite/roles/set_role-recursive.result
@@ -22,7 +22,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`
@@ -60,7 +60,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`
@@ -75,7 +75,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`
@@ -110,7 +110,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 af237113bb3..b87d60b9cc4 100644
--- a/mysql-test/suite/roles/set_role-simple.result
+++ b/mysql-test/suite/roles/set_role-simple.result
@@ -14,7 +14,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`
@@ -40,7 +40,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 738b3313bb2..0ee3fceaef5 100644
--- a/mysql-test/suite/roles/set_role-table-column-priv.result
+++ b/mysql-test/suite/roles/set_role-table-column-priv.result
@@ -16,7 +16,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`
@@ -58,7 +58,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 dcd0914db8d..24959fa20cc 100644
--- a/mysql-test/suite/roles/set_role-table-simple.result
+++ b/mysql-test/suite/roles/set_role-table-simple.result
@@ -16,7 +16,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`
@@ -56,7 +56,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_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result
index 5216a3b0a44..a4e8e6e6a38 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/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 8ca9a397354..df78f743ead 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 7bf0eac8c47..e734844e89f 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/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;
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index aff9874edc2..ebffa4ba0c4 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -3247,25 +3247,25 @@ ER_NONEXISTING_GRANT 42000
swe "Det finns inget privilegium definierat för användare '%-.48s' på '%-.64s'"
ukr "Повноважень не визначено для користувача '%-.48s' з хосту '%-.64s'"
ER_TABLEACCESS_DENIED_ERROR 42000
- cze "%-.100T příkaz nepřístupný pro uživatele: '%s'@'%s' pro tabulku '%-.192s'"
- dan "%-.100T-kommandoen er ikke tilladt for brugeren '%s'@'%s' for tabellen '%-.192s'"
- nla "%-.100T commando geweigerd voor gebruiker: '%s'@'%s' voor tabel '%-.192s'"
- eng "%-.100T command denied to user '%s'@'%s' for table '%-.192s'"
- jps "コマンド %-.100T は ユーザー '%s'@'%s' ,テーブル '%-.192s' に対して許可されていません",
- est "%-.100T käsk ei ole lubatud kasutajale '%s'@'%s' tabelis '%-.192s'"
- fre "La commande '%-.100T' est interdite à l'utilisateur: '%s'@'%s' sur la table '%-.192s'"
- ger "%-.100T Befehl nicht erlaubt für Benutzer '%s'@'%s' auf Tabelle '%-.192s'"
- hun "%-.100T parancs a '%s'@'%s' felhasznalo szamara nem engedelyezett a '%-.192s' tablaban"
- ita "Comando %-.100T negato per l'utente: '%s'@'%s' sulla tabella '%-.192s'"
- jpn "コマンド %-.100T は ユーザー '%s'@'%s' ,テーブル '%-.192s' に対して許可されていません"
- kor "'%-.100T' 명령은 다음 사용자에게 거부되었습니다. : '%s'@'%s' for 테이블 '%-.192s'"
- por "Comando '%-.100T' negado para o usuário '%s'@'%s' na tabela '%-.192s'"
- rum "Comanda %-.100T interzisa utilizatorului: '%s'@'%s' pentru tabela '%-.192s'"
- rus "Команда %-.100T запрещена пользователю '%s'@'%s' для таблицы '%-.192s'"
- serbian "%-.100T komanda zabranjena za korisnika '%s'@'%s' za tabelu '%-.192s'"
- spa "%-.100T comando negado para usuario: '%s'@'%s' para tabla '%-.192s'"
- swe "%-.100T ej tillåtet för '%s'@'%s' för tabell '%-.192s'"
- ukr "%-.100T команда заборонена користувачу: '%s'@'%s' у таблиці '%-.192s'"
+ cze "%-.100T příkaz nepřístupný pro uživatele: '%s'@'%s' pro tabulku %`s.%`s"
+ dan "%-.100T-kommandoen er ikke tilladt for brugeren '%s'@'%s' for tabellen %`s.%`s"
+ nla "%-.100T commando geweigerd voor gebruiker: '%s'@'%s' voor tabel %`s.%`s"
+ eng "%-.100T command denied to user '%s'@'%s' for table %`s.%`s"
+ jps "コマンド %-.100T は ユーザー '%s'@'%s' ,テーブル %`s.%`s に対して許可されていません",
+ est "%-.100T käsk ei ole lubatud kasutajale '%s'@'%s' tabelis %`s.%`s"
+ fre "La commande '%-.100T' est interdite à l'utilisateur: '%s'@'%s' sur la table %`s.%`s"
+ ger "%-.100T Befehl nicht erlaubt für Benutzer '%s'@'%s' auf Tabelle %`s.%`s"
+ hun "%-.100T parancs a '%s'@'%s' felhasznalo szamara nem engedelyezett a %`s.%`s tablaban"
+ ita "Comando %-.100T negato per l'utente: '%s'@'%s' sulla tabella %`s.%`s"
+ jpn "コマンド %-.100T は ユーザー '%s'@'%s' ,テーブル %`s.%`s に対して許可されていません"
+ kor "'%-.100T' 명령은 다음 사용자에게 거부되었습니다. : '%s'@'%s' for 테이블 %`s.%`s"
+ por "Comando '%-.100T' negado para o usuário '%s'@'%s' na tabela %`s.%`s"
+ rum "Comanda %-.100T interzisa utilizatorului: '%s'@'%s' pentru tabela %`s.%`s"
+ rus "Команда %-.100T запрещена пользователю '%s'@'%s' для таблицы %`s.%`s"
+ serbian "%-.100T komanda zabranjena za korisnika '%s'@'%s' za tabelu %`s.%`s"
+ spa "%-.100T comando negado para usuario: '%s'@'%s' para tabla %`s.%`s"
+ swe "%-.100T ej tillåtet för '%s'@'%s' för tabell %`s.%`s"
+ ukr "%-.100T команда заборонена користувачу: '%s'@'%s' у таблиці %`s.%`s"
ER_COLUMNACCESS_DENIED_ERROR 42000
cze "%-.32s příkaz nepřístupný pro uživatele: '%s'@'%s' pro sloupec '%-.192s' v tabulce '%-.192s'"
dan "%-.32s-kommandoen er ikke tilladt for brugeren '%s'@'%s' for kolonne '%-.192s' in tabellen '%-.192s'"
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index cc121c05a01..df4ef8522ba 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1837,7 +1837,7 @@ sp_head::execute_trigger(THD *thd,
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), priv_desc,
thd->security_ctx->priv_user, thd->security_ctx->host_or_ip,
- table_name->str);
+ db_name->str, table_name->str);
m_security_ctx.restore_security_context(thd, save_ctx);
DBUG_RETURN(TRUE);
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 0110a1f0c65..5b5150acab1 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -6540,7 +6540,8 @@ int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
table_list->grant.want_privilege);
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
command, thd->security_ctx->priv_user,
- thd->security_ctx->host_or_ip, table_list->alias.str);
+ thd->security_ctx->host_or_ip, table_list->db.str,
+ table_list->alias.str);
DBUG_RETURN(-1);
}
}
@@ -7600,8 +7601,8 @@ bool grant_reload(THD *thd)
@see check_table_access
@note
- This functions assumes that either number of tables to be inspected
- by it is limited explicitly (i.e. is is not UINT_MAX) or table list
+ This function assumes that either number of tables to be inspected
+ by it is limited explicitly (i.e. is not UINT_MAX) or table list
used and thd->lex->query_tables_own_last value correspond to each
other (the latter should be either 0 or point to next_global member
of one of elements of this table list).
@@ -7810,7 +7811,7 @@ err:
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
command,
sctx->priv_user,
- sctx->host_or_ip,
+ sctx->host_or_ip, tl ? tl->db.str : "unknown",
tl ? tl->get_table_name() : "unknown");
}
DBUG_RETURN(TRUE);
@@ -7993,7 +7994,7 @@ bool check_grant_all_columns(THD *thd, ulong want_access_arg,
Security_context *sctx= thd->security_ctx;
ulong UNINIT_VAR(want_access);
const char *table_name= NULL;
- const char* db_name;
+ const char* db_name= NULL;
GRANT_INFO *grant;
GRANT_TABLE *UNINIT_VAR(grant_table);
GRANT_TABLE *UNINIT_VAR(grant_table_role);
@@ -8081,7 +8082,7 @@ err:
if (using_column_privileges)
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
command, sctx->priv_user,
- sctx->host_or_ip, table_name);
+ sctx->host_or_ip, db_name, table_name);
else
my_error(ER_COLUMNACCESS_DENIED_ERROR, MYF(0),
command,
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 60b0b88bf5f..614d6d58c0b 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -8101,19 +8101,20 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
tables->is_natural_join);
DBUG_ASSERT(item->type() == Item::FIELD_ITEM);
Item_field *fld= (Item_field*) item;
+ const char *field_db_name= field_iterator.get_db_name();
const char *field_table_name= field_iterator.get_table_name();
if (!tables->schema_table &&
!(fld->have_privileges=
(get_column_grant(thd, field_iterator.grant(),
- field_iterator.get_db_name(),
+ field_db_name,
field_table_name, fld->field_name.str) &
VIEW_ANY_ACL)))
{
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0), "ANY",
thd->security_ctx->priv_user,
thd->security_ctx->host_or_ip,
- field_table_name);
+ field_db_name, field_table_name);
DBUG_RETURN(TRUE);
}
}
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 5807be62339..ca82c36d568 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -7158,7 +7158,6 @@ bool check_fk_parent_table_access(THD *thd,
if (key->type == Key::FOREIGN_KEY)
{
TABLE_LIST parent_table;
- bool is_qualified_table_name;
Foreign_key *fk_key= (Foreign_key *)key;
LEX_CSTRING db_name;
LEX_CSTRING table_name= { fk_key->ref_table.str,
@@ -7176,7 +7175,6 @@ bool check_fk_parent_table_access(THD *thd,
if (fk_key->ref_db.str)
{
- is_qualified_table_name= true;
if (!(db_name.str= (char *) thd->memdup(fk_key->ref_db.str,
fk_key->ref_db.length+1)))
return true;
@@ -7198,7 +7196,6 @@ bool check_fk_parent_table_access(THD *thd,
if (!(db_name.str= (char *) thd->memdup(create_db,
db_name.length+1)))
return true;
- is_qualified_table_name= true;
if (check_db_name((LEX_STRING*) &db_name))
{
@@ -7210,8 +7207,6 @@ bool check_fk_parent_table_access(THD *thd,
{
if (thd->lex->copy_db_to(&db_name))
return true;
- else
- is_qualified_table_name= false;
}
}
@@ -7237,22 +7232,11 @@ bool check_fk_parent_table_access(THD *thd,
if (check_some_access(thd, privileges, &parent_table) ||
parent_table.grant.want_privilege)
{
- if (is_qualified_table_name)
- {
- const size_t qualified_table_name_len= NAME_LEN + 1 + NAME_LEN + 1;
- char *qualified_table_name= (char *) thd->alloc(qualified_table_name_len);
-
- my_snprintf(qualified_table_name, qualified_table_name_len, "%s.%s",
- db_name.str, table_name.str);
- table_name.str= qualified_table_name;
- }
-
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
- "REFERENCES",
- thd->security_ctx->priv_user,
- thd->security_ctx->host_or_ip,
- table_name.str);
-
+ "REFERENCES",
+ thd->security_ctx->priv_user,
+ thd->security_ctx->host_or_ip,
+ db_name.str, table_name.str);
return true;
}
}
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index b2851d7defc..eaed36a3506 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1172,7 +1172,8 @@ public:
my_snprintf(m_view_access_denied_message, MYSQL_ERRMSG_SIZE,
ER_THD(thd, ER_TABLEACCESS_DENIED_ERROR), "SHOW VIEW",
m_sctx->priv_user,
- m_sctx->host_or_ip, m_top_view->get_table_name());
+ m_sctx->host_or_ip,
+ m_top_view->get_db_name(), m_top_view->get_table_name());
}
return m_view_access_denied_message_ptr;
}
@@ -1264,7 +1265,8 @@ mysqld_show_create_get_fields(THD *thd, TABLE_LIST *table_list,
DBUG_PRINT("debug", ("check_table_access failed"));
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
"SHOW", thd->security_ctx->priv_user,
- thd->security_ctx->host_or_ip, table_list->alias.str);
+ thd->security_ctx->host_or_ip,
+ table_list->db.str, table_list->alias.str);
goto exit;
}
DBUG_PRINT("debug", ("check_table_access succeeded"));
@@ -1293,7 +1295,8 @@ mysqld_show_create_get_fields(THD *thd, TABLE_LIST *table_list,
{
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
"SHOW", thd->security_ctx->priv_user,
- thd->security_ctx->host_or_ip, table_list->alias.str);
+ thd->security_ctx->host_or_ip,
+ table_list->db.str, table_list->alias.str);
goto exit;
}
}
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index b6787a1cb8b..d8b68725f3e 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -302,7 +302,8 @@ bool create_view_precheck(THD *thd, TABLE_LIST *tables, TABLE_LIST *view,
{
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
"ANY", thd->security_ctx->priv_user,
- thd->security_ctx->priv_host, tbl->table_name.str);
+ thd->security_ctx->priv_host,
+ tbl->db.str, tbl->table_name.str);
goto err;
}
/*
diff --git a/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_5_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_5_tokudb.result
index 2e31fc57dd4..aa35364b811 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_5_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_5_tokudb.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/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_8_tokudb.result b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_8_tokudb.result
index 2fd45be9261..842c93ac403 100644
--- a/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_8_tokudb.result
+++ b/storage/tokudb/mysql-test/tokudb_parts/r/partition_exch_qa_8_tokudb.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;