percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load Encode before trying to use Encode::resolve_alias

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-03-06 13:38:28 -03:00
parent d20d8bb878 55ee808310
commit 51017de5d5
2 changed files with 96 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
bin/pt-archiver
View File

@@ -3953,15 +3953,24 @@ sub main {
# Open the file and print the header to it. # Open the file and print the header to it.
if ( $archive_file ) { if ( $archive_file ) {
my $need_hdr = $o->get('header') && !-f $archive_file; my $need_hdr = $o->get('header') && !-f $archive_file;
my $charset = lc $o->get('charset'); my $charset = $o->get('charset');
if ( $charset ) { $charset = $charset
$archive_fh = IO::File->new($archive_file, ">>:$charset") ? do {
or die "Cannot open $charset $archive_file: $OS_ERROR\n"; eval { require Encode }
} or (PTDEBUG &&
else { _d("Couldn't load Encode: ", $EVAL_ERROR,
$archive_fh = IO::File->new($archive_file, ">>") "Going to try using the charset ",
or die "Cannot open $archive_file: $OS_ERROR\n"; "passed in without checking it."));
} # No need to punish a user if they did their
# homework and passed in an official charset,
# rather than an alias.
":" . defined &Encode::resolve_alias
? Encode::resolve_alias($charset)
: $charset;
}
: '';
$archive_fh = IO::File->new($archive_file, ">>$charset")
or die "Cannot open $charset $archive_file: $OS_ERROR\n";
$archive_fh->autoflush(1) unless $o->get('buffer'); $archive_fh->autoflush(1) unless $o->get('buffer');
if ( $need_hdr ) { if ( $need_hdr ) {
print $archive_fh '', escape(\@sel_cols), "\n" print $archive_fh '', escape(\@sel_cols), "\n"

78
t/pt-archiver/issue_903379.t Normal file
View File

@@ -0,0 +1,78 @@
#!/usr/bin/env perl
BEGIN {
die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
};
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More;
use PerconaTest;
use Sandbox;
require "$trunk/bin/pt-archiver";
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $dbh = $sb->get_dbh_for('master');
if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master';
}
else {
plan tests => 2;
}
my $output;
my $rows;
my $cnf = "/tmp/12345/my.sandbox.cnf";
$sb->load_file('master', 't/pt-archiver/samples/issue_1152.sql');
# #############################################################################
# Bug #903379: --file & --charset could cause warnings and exceptions
# #############################################################################
$output = output(
sub {
no warnings "syntax";
pt_archiver::main(
'--source', 'h=127.1,P=12345,D=issue_1152,t=t,u=msandbox,p=msandbox',
'--dest', 'h=127.1,P=12345,D=issue_1152_archive,t=t',
'--columns', 'a,b,c',
'--where', 'id = 5',
qw( --nocheck-columns --replace --commit-each --bulk-insert --bulk-delete
--statistics
--no-check-charset ),
'--file', '/tmp/mysql/%Y-%m-%d-%D_%H:%i:%s.%t',
)
},
);
ok(1, "pt-archiver with an explicit --file works");
$output = output(
sub {
no warnings "syntax";
pt_archiver::main(
'--source', 'h=127.1,P=12345,D=issue_1152,t=t,u=msandbox,p=msandbox',
'--dest', 'h=127.1,P=12345,D=issue_1152_archive,t=t',
'--columns', 'a,b,c',
'--where', 'id = 5',
qw( --nocheck-columns --replace --commit-each --bulk-insert --bulk-delete
--statistics
--no-check-charset ),
'--file', '/tmp/mysql/%Y-%m-%d-%D_%H:%i:%s.%t',
'--charset', 'latin1',
)
},
);
ok(1, "pt-archiver with an explicit --file & --charset works, even if the charset isn't official");
# #############################################################################
# Done.
# #############################################################################
$sb->wipe_clean($dbh);
exit;