Merge lp:~percona-dev/percona-patches/5.0.84-fix-bug-352840 into lp:~percona-dev/percona-patches/5.0.84

[Yasufumi Kinoshita]

[Vadim Tkachenko (vadim-tk)]

review: Approve

=== modified file 'innodb_io_pattern.patch'
--- innodb_io_pattern.patch	2009-07-30 02:52:30 +0000
+++ innodb_io_pattern.patch	2009-08-03 01:44:01 +0000
@@ -560,7 +560,7 @@
  #ifndef NO_EMBEDDED_ACCESS_CHECKS
  static const char *grant_names[]={
    "select","insert","update","delete","create","drop","reload","shutdown",
-@@ -4108,6 +4119,67 @@
+@@ -4108,6 +4119,72 @@
    DBUG_RETURN(res);
  }
  
@@ -574,6 +574,11 @@
 +  DBUG_ENTER("innodb_io_pattern_fill_table");
 +  int returnable= 0;
 +
++  /* deny access to non-superusers */
++  if (check_global_access(thd, PROCESS_ACL)) {
++    DBUG_RETURN(0);
++  }
++
 +  /* We cannot use inline functions of InnoDB here */
 +
 +  /* !!!!!ATTENTION!!!!!: This function is not protected by mutex for performance.     */
 
=== modified file 'innodb_show_bp.patch'
--- innodb_show_bp.patch	2008-11-15 19:45:32 +0000
+++ innodb_show_bp.patch	2009-08-03 01:44:01 +0000
@@ -386,7 +386,7 @@
  #endif
  
  #ifndef NO_EMBEDDED_ACCESS_CHECKS
-@@ -4042,6 +4046,13 @@
+@@ -4042,6 +4046,19 @@
    DBUG_RETURN(res);
  }
  
@@ -394,6 +394,12 @@
 +{
 +  DBUG_ENTER("fill_innodb_bp_content");
 +  int res= 0;
++
++  /* deny access to non-superusers */
++  if (check_global_access(thd, PROCESS_ACL)) {
++    DBUG_RETURN(0);
++  }
++
 +  innodb_I_S_buffer_pool_content(thd, tables);
 +  DBUG_RETURN(res);
 +}