diff options
| author | unknown <serg@serg.mysql.com> | 2002-10-25 21:15:52 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-10-25 21:15:52 +0000 |
| commit | f5563ddad40e8ab84d457b0e9960ddfdc7faec99 (patch) | |
| tree | 30c13439b168df68d4884a7403a173a8970cc56e /scripts | |
| parent | 68a5932ab2b5e39858fa03934cbbe5c90042497e (diff) | |
| parent | 43abd169b081479cb6ce1ad510a2620a2bb50db8 (diff) | |
| download | mariadb-git-f5563ddad40e8ab84d457b0e9960ddfdc7faec99.tar.gz | |
merged
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb:
Delete: BitKeeper/etc/skipkeys
BitKeeper/etc/skipkeys:
Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys
Build-tools/Do-compile:
Auto merged
Docs/manual.texi:
Auto merged
innobase/pars/lexyy.c:
Auto merged
innobase/pars/pars0grm.c:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/nt_servc.cc:
Auto merged
sql/nt_servc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/bdb-crash.test:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_convert_table_format.sh | 2 | ||||
| -rw-r--r-- | scripts/mysqlhotcopy.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh index 6b9a75228d3..c1955e632fb 100644 --- a/scripts/mysql_convert_table_format.sh +++ b/scripts/mysql_convert_table_format.sh @@ -64,7 +64,7 @@ foreach $table (@ARGV) { if (uc($row->[1]) eq uc($opt_type)) { - print "$table is alread of type $opt_type; Ignored\n"; + print "$table is already of type $opt_type; Ignored\n"; next; } } diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index d808ffdcaef..bc23c0e5d95 100644 --- a/scripts/mysqlhotcopy.sh +++ b/scripts/mysqlhotcopy.sh @@ -559,15 +559,15 @@ sub copy_files { my @cp = ($method); # add option to preserve mod time etc of copied files # not critical, but nice to have - push @cp, "-p" if $^O =~ m/^(solaris|linux|freebsd)$/; + push @cp, "-p" if $^O =~ m/^(solaris|linux|freebsd|darwin)$/; # add recursive option for scp - push @cp, "-r" if $^O =~ /m^(solaris|linux|freebsd)$/ && $method =~ /^scp\b/; + push @cp, "-r" if $^O =~ /m^(solaris|linux|freebsd|darwin)$/ && $method =~ /^scp\b/; my @non_raid = map { "'$_'" } grep { ! m:/\d{2}/[^/]+$: } @$files; # add files to copy and the destination directory -+ safe_system( @cp, @non_raid, "'$target'" ); + safe_system( @cp, @non_raid, "'$target'" ); foreach my $rd ( @$raid_dirs ) { my @raid = map { "'$_'" } grep { m:$rd/: } @$files; |