Commit 66bdcf84 authored by unknown's avatar unknown

Fixed Bug#5575, mysqlhotcopy is broken when using --noindices


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent 7949ffc8
...@@ -47,6 +47,7 @@ igor@hundin.mysql.fi ...@@ -47,6 +47,7 @@ igor@hundin.mysql.fi
igor@rurik.mysql.com igor@rurik.mysql.com
ingo@mysql.com ingo@mysql.com
jani@a80-186-24-72.elisa-laajakaista.fi jani@a80-186-24-72.elisa-laajakaista.fi
jani@a80-186-41-201.elisa-laajakaista.fi
jani@dsl-jkl1657.dial.inet.fi jani@dsl-jkl1657.dial.inet.fi
jani@hynda.(none) jani@hynda.(none)
jani@hynda.mysql.fi jani@hynda.mysql.fi
......
...@@ -8,7 +8,7 @@ use File::Path; ...@@ -8,7 +8,7 @@ use File::Path;
use DBI; use DBI;
use Sys::Hostname; use Sys::Hostname;
use File::Copy; use File::Copy;
use File::Temp; use File::Temp qw(tempfile);
=head1 NAME =head1 NAME
...@@ -39,7 +39,7 @@ WARNING: THIS PROGRAM IS STILL IN BETA. Comments/patches welcome. ...@@ -39,7 +39,7 @@ WARNING: THIS PROGRAM IS STILL IN BETA. Comments/patches welcome.
# Documentation continued at end of file # Documentation continued at end of file
my $VERSION = "1.21"; my $VERSION = "1.22";
my $opt_tmpdir = $ENV{TMPDIR} || "/tmp"; my $opt_tmpdir = $ENV{TMPDIR} || "/tmp";
...@@ -654,8 +654,8 @@ sub copy_index ...@@ -654,8 +654,8 @@ sub copy_index
} }
elsif ($opt{method} =~ /^scp\b/) elsif ($opt{method} =~ /^scp\b/)
{ {
my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir); my ($fh, $tmp)= tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir) or
die "Can\'t create/open file in $opt_tmpdir\n"; die "Can\'t create/open file in $opt_tmpdir\n";
if (syswrite($fh,$buff) != length($buff)) if (syswrite($fh,$buff) != length($buff))
{ {
die "Error when writing data to $tmp: $!\n"; die "Error when writing data to $tmp: $!\n";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment