summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2002-10-16 13:11:25 +0300
committermonty@hundin.mysql.fi <>2002-10-16 13:11:25 +0300
commit67d3cd643b00d78e7236200f31efa9ec57a2083a (patch)
treed165b4baadac24102545d94c8f9fe180537a64f5 /scripts
parent3712931cc6afb555146f668c63a8cba3bed33274 (diff)
parent87351da2040a11613d9f7b9aef05cab945b5ee2f (diff)
downloadmariadb-git-67d3cd643b00d78e7236200f31efa9ec57a2083a.tar.gz
Merge with 3.23.54
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqlhotcopy.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh
index 1aad5c95c25..d808ffdcaef 100644
--- a/scripts/mysqlhotcopy.sh
+++ b/scripts/mysqlhotcopy.sh
@@ -37,7 +37,7 @@ WARNING: THIS PROGRAM IS STILL IN BETA. Comments/patches welcome.
# Documentation continued at end of file
-my $VERSION = "1.16";
+my $VERSION = "1.17";
my $opt_tmpdir = $ENV{TMPDIR} || "/tmp";
@@ -388,6 +388,8 @@ foreach my $rdb ( @db_desc ) {
foreach my $td ( '', @{$rdb->{raid_dirs}} ) {
my $tgt_dirpath = "$rdb->{target}/$td";
+ # Remove trailing slashes (needed for Mac OS X)
+ substr($tgt_dirpath, 1) =~ s|/+$||;
if ( $opt{dryrun} ) {
print "mkdir $tgt_dirpath, 0750\n";
}
@@ -1001,3 +1003,5 @@ resulted in nothing being copied when a regexp was specified but no
database name(s).
Martin Waite - Fix to handle database name that contains space.
+
+Paul DuBois - Remove end '/' from directory names