From: Marc Alff
Date: April 21 2010 7:10am
Subject: bzr push into mysql-6.0-codebase-bugfixing branch (marc.alff:3824 to
 3825)
List-Archive: http://lists.mysql.com/commits/106183
Message-Id: <20100421071037.42B3E47477C@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_IjIlGX7cENRAv6DWLZvfMA)"

--Boundary_(ID_IjIlGX7cENRAv6DWLZvfMA)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 3825 Marc Alff	2010-04-21 [merge]
      Manual merge, mysql-next-mr-bugfixing --> mysql-6.0-codebase-bugfixing

    modified:
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/t/misc.test
      storage/perfschema/pfs_engine_table.cc
 3824 Mats Kindahl	2010-04-21 [merge]
      Merging with mysql-trunk-next-mr-bugfixing

=== modified file 'mysql-test/suite/perfschema/r/misc.result'
--- a/mysql-test/suite/perfschema/r/misc.result	2010-03-01 15:51:36 +0000
+++ b/mysql-test/suite/perfschema/r/misc.result	2010-04-21 07:09:38 +0000
@@ -25,3 +25,5 @@ drop table test.ghost;
 select * from performance_schema.FILE_INSTANCES
 where file_name like "%ghost%";
 FILE_NAME	EVENT_NAME	OPEN_COUNT
+select * from performance_schema.no_such_table;
+ERROR 42S02: Table 'performance_schema.no_such_table' doesn't exist

=== modified file 'mysql-test/suite/perfschema/t/misc.test'
--- a/mysql-test/suite/perfschema/t/misc.test	2010-03-22 13:12:28 +0000
+++ b/mysql-test/suite/perfschema/t/misc.test	2010-04-21 07:09:38 +0000
@@ -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
 # it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # Tests for PERFORMANCE_SCHEMA
 # Miscelaneous
@@ -76,3 +76,10 @@ drop table test.ghost;
 select * from performance_schema.FILE_INSTANCES
   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;
+

=== modified file 'storage/perfschema/pfs_engine_table.cc'
--- a/storage/perfschema/pfs_engine_table.cc	2010-04-20 10:03:59 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-04-21 07:09:38 +0000
@@ -11,7 +11,8 @@
 
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
 
 /**
   @file storage/perfschema/pfs_engine_table.cc
@@ -472,7 +473,22 @@ PFS_unknown_acl pfs_unknown_acl;
 ACL_internal_access_result
 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;
 }
 
 /**


--Boundary_(ID_IjIlGX7cENRAv6DWLZvfMA)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/marc.alff@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/marc.alff@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\
#   bugfixing/
# testament_sha1: 11a719a8bac7c7b021140fbe9b4a9aa47b2b2b2c
# timestamp: 2010-04-21 01:10:37 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/
# base_revision_id: mats@stripped
# 
# Begin bundle
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


--Boundary_(ID_IjIlGX7cENRAv6DWLZvfMA)--