diff options
| author | unknown <monty@mysql.com> | 2004-10-08 15:43:27 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-08 15:43:27 +0300 |
| commit | b5f445a0e9f35809d49faee64b69f45c12e8d877 (patch) | |
| tree | 26d8a4d43267899111e3c944feb5b5c4064aaf54 /scripts/mysqlhotcopy.sh | |
| parent | 57fedc40708ed3266d79347cd71e829297352409 (diff) | |
| parent | 66bdcf8439c3397856d028b13a6f0bb09769434d (diff) | |
| download | mariadb-git-b5f445a0e9f35809d49faee64b69f45c12e8d877.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
innobase/include/sync0arr.h:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
innobase/srv/srv0srv.c:
SCCS merged
Diffstat (limited to 'scripts/mysqlhotcopy.sh')
| -rw-r--r-- | scripts/mysqlhotcopy.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index b8494727975..2cfe91da115 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -8,7 +8,7 @@ use File::Path; use DBI; use Sys::Hostname; use File::Copy; -use File::Temp; +use File::Temp qw(tempfile); =head1 NAME @@ -39,7 +39,7 @@ WARNING: THIS PROGRAM IS STILL IN BETA. Comments/patches welcome. # Documentation continued at end of file -my $VERSION = "1.21"; +my $VERSION = "1.22"; my $opt_tmpdir = $ENV{TMPDIR} || "/tmp"; @@ -655,8 +655,8 @@ sub copy_index } elsif ($opt{method} =~ /^scp\b/) { - my ($fh, $tmp)=tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir); - die "Can\'t create/open file in $opt_tmpdir\n"; + my ($fh, $tmp)= tempfile('mysqlhotcopy-XXXXXX', DIR => $opt_tmpdir) or + die "Can\'t create/open file in $opt_tmpdir\n"; if (syswrite($fh,$buff) != length($buff)) { die "Error when writing data to $tmp: $!\n"; |