From: Marc Alff
Date: April 21 2010 6:53am
Subject: bzr push into mysql-next-mr-bugfixing branch (marc.alff:3146)
List-Archive: http://lists.mysql.com/commits/106181
Message-Id: <20100421065305.B07F847119E@MarcBook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_GgMLX22eQM+z5b4hb57DHQ)"

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

 3146 Marc Alff	2010-04-21 [merge]
      local merge

    removed:
      sql/mysql_priv.h.pp
    modified:
      Makefile.am
      cmake/abi_check.cmake
      include/mysql/innodb_priv.h
      sql/share/errmsg-utf8.txt
      sql/sql_priv.h
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/i_s.cc
=== modified file 'mysql-test/suite/perfschema/r/misc.result'
--- a/mysql-test/suite/perfschema/r/misc.result	2010-02-26 17:39:57 +0000
+++ b/mysql-test/suite/perfschema/r/misc.result	2010-04-07 08:53:19 +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 09:08:28 +0000
+++ b/mysql-test/suite/perfschema/t/misc.test	2010-04-07 08:53:19 +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 09:41:41 +0000
+++ b/storage/perfschema/pfs_engine_table.cc	2010-04-21 06:31:36 +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
@@ -471,7 +472,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_GgMLX22eQM+z5b4hb57DHQ)
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-next-mr-bugfixing-\
#   52586/
# testament_sha1: a92c449c1742c74ee9712d5fd4d9cdd4ffec93cc
# timestamp: 2010-04-21 00:53:05 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/
# base_revision_id: mats@stripped
# 
# Begin bundle
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
dhAf/F3JFOFCQ96EPfQ=


--Boundary_(ID_GgMLX22eQM+z5b4hb57DHQ)--