percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-03-02 02:05:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix problems with regex matching and PROXY grant in MySQL 5.5

Browse Source
This commit is contained in:
Baron Schwartz
2012-06-04 00:05:05 -04:00
parent e7b2171696
commit 45c85ba40d
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pt-show-grants
View File

@@ -1719,7 +1719,7 @@ sub main {
if ( $o->get('separate') ) { # List each grant separately.
@grants = map {
my ( $grants, $on_what ) = $_ =~ m/GRANT (.*?) ON ((?:`|\*).*)$/;
my ( $grants, $on_what ) = $_ =~ m/GRANT (.*?) ON (.*)$/;
map { "GRANT $_ ON $on_what" } split(', ', $grants);
} @grants;
my $count;
@@ -1753,16 +1753,10 @@ sub main {
my $grant = $_;
PTDEBUG && _d($grant);
my ( $grants, $on_what, $user ) = $grant
=~ m/GRANT (.*?) ON ((?:`|\*).*?) TO ('[^']*'\@'[^']+')?/;
=~ m/GRANT (.*?) ON (.*?) TO ('[^']*'\@'[^']*')/;
PTDEBUG && _d('grants:', $grants, 'on_what:', $on_what,
'user:', $user);
if ( !$user ) {
# Anonymous user: ''@'' (issue 445).
PTDEBUG && _d('Anonymous user');
$user = "''\@''";
}
my @result;
if ( $o->get('separate') ) {
@result = map { "REVOKE $_ ON $on_what FROM $user" }