diff options
| author | monty@hundin.mysql.fi <> | 2002-03-06 19:53:31 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-03-06 19:53:31 +0200 |
| commit | fa38c84be7d989edd97e84c85904137cef3c70d4 (patch) | |
| tree | 2b4665ab89a9c440f5e2f451d1d745df1c15288d /scripts | |
| parent | 4508fbb558b793cd23d7bb6a77b135130c071d88 (diff) | |
| parent | 668d09cc5c4e0c9e7c180f2dfb521244f325cf3f (diff) | |
| download | mariadb-git-fa38c84be7d989edd97e84c85904137cef3c70d4.tar.gz | |
merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 | ||||
| -rw-r--r-- | scripts/mysqlhotcopy.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 5504d929ede..e6ecbf6f729 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -291,7 +291,7 @@ do I=1 while test "$I" -le "$numofproces" do - PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | tail -1` + PROC=`ps xa | grep $ledir/$MYSQLD | grep -v "grep" | sed -n '$p'` for T in $PROC do break diff --git a/scripts/mysqlhotcopy.sh b/scripts/mysqlhotcopy.sh index 063ff8be750..642b1fb78c9 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.14"; +my $VERSION = "1.15"; my $opt_tmpdir = $ENV{TMPDIR} || "/tmp"; @@ -562,7 +562,7 @@ sub copy_files { # add recursive option for scp push @cp, "-r" if $^O =~ /m^(solaris|linux|freebsd)$/ && $method =~ /^scp\b/; - my @non_raid = grep { $_ !~ m:\d\d/: } @$files; + my @non_raid = grep { ! m:/\d{2}/[^/]+$: } @$files; # add files to copy and the destination directory safe_system( @cp, @non_raid, $target ); |