database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#52586 Misleading error message on attempt to access a P_S table using a wrong name

Browse Source 
Backport from mysql-next-mr (5.6) to mysql-trunk (5.5)
This commit is contained in:
Marc Alff
2010-07-15 18:50:39 -06:00
parent bc6092a497
commit 36e80ced63
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/r/misc.result
View File

@ -25,3 +25,5 @@ drop table test.ghost;
select * from performance_schema.FILE_INSTANCES select * from performance_schema.FILE_INSTANCES
where file_name like "%ghost%"; where file_name like "%ghost%";
FILE_NAME EVENT_NAME OPEN_COUNT FILE_NAME EVENT_NAME OPEN_COUNT
select * from performance_schema.no_such_table;
ERROR 42S02: Table 'performance_schema.no_such_table' doesn't exist

14
mysql-test/suite/perfschema/t/misc.test
View File

@ -1,4 +1,4 @@
# Copyright (C) 2009 Sun Microsystems, Inc # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -10,15 +10,14 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software Foundation,
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
# Tests for PERFORMANCE_SCHEMA # Tests for PERFORMANCE_SCHEMA
# Miscelaneous # Miscelaneous
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source include/not_var_link.inc
# #
# Bug#45496 Performance schema: assertion fails in # Bug#45496 Performance schema: assertion fails in
@ -77,3 +76,10 @@ drop table test.ghost;
select * from performance_schema.FILE_INSTANCES select * from performance_schema.FILE_INSTANCES
where file_name like "%ghost%"; where file_name like "%ghost%";
#
# Bug#52586 Misleading error message on attempt to access
# a P_S table using a wrong name
--error ER_NO_SUCH_TABLE
select * from performance_schema.no_such_table;

17
storage/perfschema/pfs_engine_table.cc
View File

@ -466,7 +466,22 @@ PFS_unknown_acl pfs_unknown_acl;
ACL_internal_access_result ACL_internal_access_result
PFS_unknown_acl::check(ulong want_access, ulong *save_priv) const PFS_unknown_acl::check(ulong want_access, ulong *save_priv) const
{ {
return ACL_INTERNAL_ACCESS_DENIED; const ulong always_forbidden= INSERT_ACL | UPDATE_ACL | DELETE_ACL
| CREATE_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL
| CREATE_VIEW_ACL | TRIGGER_ACL | LOCK_TABLES_ACL;
if (unlikely(want_access & always_forbidden))
return ACL_INTERNAL_ACCESS_DENIED;
/*
There is no point in hidding (by enforcing ACCESS_DENIED for SELECT_ACL
on performance_schema.*) tables that do not exist anyway.
When SELECT_ACL is granted on performance_schema.* or *.*,
SELECT * from performance_schema.wrong_table
will fail with a more understandable ER_NO_SUCH_TABLE error,
instead of ER_TABLEACCESS_DENIED_ERROR.
*/
return ACL_INTERNAL_ACCESS_CHECK_GRANT;
} }
/** /**