percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 14:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved a pending merge conflict.

Browse Source 
The fix for https://bugs.launchpad.net/percona-toolkit/+bug/916168
was affecting the same code as this fix.
This commit mimicks that fix, and removes the privs checks.
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-07-31 12:26:13 -03:00
parent a94da84b27
commit e7d778e4ee
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bin/pt-table-checksum
View File

@@ -8189,11 +8189,19 @@ sub check_repl_table {
# Always create the table, unless --no-create-replicate-table # Always create the table, unless --no-create-replicate-table
# was passed in; see https://bugs.launchpad.net/percona-toolkit/+bug/950294 # was passed in; see https://bugs.launchpad.net/percona-toolkit/+bug/950294
if ( !$tbl_exists && !$o->get('create-replicate-table') ) { if ( !$tbl_exists ) {
die "--replicate table $repl_table does not exist and " if ( !$o->get('create-replicate-table') ) {
. "--no-create-replicate-table was specified. " die "--replicate table $repl_table does not exist and "
. "You need to create the table.\n"; . "--no-create-replicate-table was specified. "
. "You need to create the table.\n";
}
} }
else {
PTDEBUG && _d('--replicate table', $repl_table, 'already exists');
# We used to check the table privs here, but:
# https://bugs.launchpad.net/percona-toolkit/+bug/916168
}
if ( $o->get('create-replicate-table') ) { if ( $o->get('create-replicate-table') ) {
local $@; local $@;
eval { eval {
@@ -8216,16 +8224,6 @@ sub check_repl_table {
} }
} }
# Check it again but this time check the privs.
my $have_tbl_privs = $tp->check_table(
dbh => $dbh,
db => $db,
tbl => $tbl,
all_privs => 1,
);
die "User does not have all privileges on --replicate table "
. "$repl_table.\n" unless $have_tbl_privs;
# Check and wait for the repl table to appear on all slaves. # Check and wait for the repl table to appear on all slaves.
# https://bugs.launchpad.net/percona-toolkit/+bug/1008778 # https://bugs.launchpad.net/percona-toolkit/+bug/1008778
if ( scalar @$slaves ) { if ( scalar @$slaves ) {