1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #18777: Mysqlhotcopy does not copy all the direcories.

Browse Source
This commit is contained in:
iggy@rolltop.ignatz42.dyndns.org 2006-07-26 12:36:10 -04:00
parent 23c2570a5e
commit b146324946
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/mysqlhotcopy.sh
View File

@ -262,6 +262,7 @@ my $hc_locks = "";
my $hc_tables = ""; my $hc_tables = "";
my $num_tables = 0; my $num_tables = 0;
my $num_files = 0; my $num_files = 0;
my $raid_dir_regex = '[A-Za-z0-9]{2}';
foreach my $rdb ( @db_desc ) { foreach my $rdb ( @db_desc ) {
my $db = $rdb->{src}; my $db = $rdb->{src};
@ -296,7 +297,7 @@ foreach my $rdb ( @db_desc ) {
my @raid_dir = (); my @raid_dir = ();
while ( defined( my $name = readdir DBDIR ) ) { while ( defined( my $name = readdir DBDIR ) ) {
if ( $name =~ /^\d\d$/ && -d "$db_dir/$name" ) { if ( $name =~ /^$raid_dir_regex$/ && -d "$db_dir/$name" ) {
push @raid_dir, $name; push @raid_dir, $name;
} }
else { else {
@ -604,7 +605,7 @@ sub copy_files {
# add recursive option for scp # add recursive option for scp
$cp.= " -r" if $^O =~ /m^(solaris|linux|freebsd|darwin)$/ && $method =~ /^scp\b/; $cp.= " -r" if $^O =~ /m^(solaris|linux|freebsd|darwin)$/ && $method =~ /^scp\b/;
my @non_raid = map { "'$_'" } grep { ! m:/\d{2}/[^/]+$: } @$files; my @non_raid = map { "'$_'" } grep { ! m:/$raid_dir_regex/[^/]+$: } @$files;
# add files to copy and the destination directory # add files to copy and the destination directory
safe_system( $cp, @non_raid, "'$target'" ) if (@non_raid); safe_system( $cp, @non_raid, "'$target'" ) if (@non_raid);
@ -797,7 +798,7 @@ sub get_raid_dirs {
my %dirs = (); my %dirs = ();
foreach my $f ( @$r_files ) { foreach my $f ( @$r_files ) {
if ( $f =~ m:^(\d\d)/: ) { if ( $f =~ m:^($raid_dir_regex)/: ) {
$dirs{$1} = 1; $dirs{$1} = 1;
} }
} }