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

Proposed by Yasufumi Kinoshita
Status: Merged
Merge reported by: Yasufumi Kinoshita
Merged at revision: not available
Proposed branch: lp:~percona-dev/percona-patches/5.0.84-fix-bug-352840
Merge into: lp:~percona-dev/percona-patches/5.0.84
Diff against target: None lines
To merge this branch: bzr merge lp:~percona-dev/percona-patches/5.0.84-fix-bug-352840
Reviewer Review Type Date Requested Status
Vadim Tkachenko Approve
Review via email: mp+9560@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vadim Tkachenko (vadim-tk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'innodb_io_pattern.patch'
2--- innodb_io_pattern.patch 2009-07-30 02:52:30 +0000
3+++ innodb_io_pattern.patch 2009-08-03 01:44:01 +0000
4@@ -560,7 +560,7 @@
5 #ifndef NO_EMBEDDED_ACCESS_CHECKS
6 static const char *grant_names[]={
7 "select","insert","update","delete","create","drop","reload","shutdown",
8-@@ -4108,6 +4119,67 @@
9+@@ -4108,6 +4119,72 @@
10 DBUG_RETURN(res);
11 }
12
13@@ -574,6 +574,11 @@
14 + DBUG_ENTER("innodb_io_pattern_fill_table");
15 + int returnable= 0;
16 +
17++ /* deny access to non-superusers */
18++ if (check_global_access(thd, PROCESS_ACL)) {
19++ DBUG_RETURN(0);
20++ }
21++
22 + /* We cannot use inline functions of InnoDB here */
23 +
24 + /* !!!!!ATTENTION!!!!!: This function is not protected by mutex for performance. */
25
26=== modified file 'innodb_show_bp.patch'
27--- innodb_show_bp.patch 2008-11-15 19:45:32 +0000
28+++ innodb_show_bp.patch 2009-08-03 01:44:01 +0000
29@@ -386,7 +386,7 @@
30 #endif
31
32 #ifndef NO_EMBEDDED_ACCESS_CHECKS
33-@@ -4042,6 +4046,13 @@
34+@@ -4042,6 +4046,19 @@
35 DBUG_RETURN(res);
36 }
37
38@@ -394,6 +394,12 @@
39 +{
40 + DBUG_ENTER("fill_innodb_bp_content");
41 + int res= 0;
42++
43++ /* deny access to non-superusers */
44++ if (check_global_access(thd, PROCESS_ACL)) {
45++ DBUG_RETURN(0);
46++ }
47++
48 + innodb_I_S_buffer_pool_content(thd, tables);
49 + DBUG_RETURN(res);
50 +}

Subscribers

People subscribed via source and target branches

to all changes: