=== modified file 'lib/DBServer/MySQL/MySQLd.pm' --- lib/DBServer/MySQL/MySQLd.pm 2010-06-08 12:33:17 +0000 +++ lib/DBServer/MySQL/MySQLd.pm 2010-08-03 07:29:32 +0000 @@ -395,10 +395,16 @@ sub dumpdb { my ($self,$database, $file) = @_; say("Dumping MySQL server ".$self->version." on port ".$self->port); - my $dump_result = system('"'.$self->dumper. - "\" --hex-blob --no-tablespaces --skip-triggers --compact --order-by-primary --skip-extended-insert --no-create-info --host=127.0.0.1 --port=". - $self->port. - " --user=root $database | sort > $file"); + my $dump_command = '"'.$self->dumper. + "\" --hex-blob --skip-triggers --compact ". + "--order-by-primary --skip-extended-insert ". + "--no-create-info --host=127.0.0.1 ". + "--port=".$self->port; + # --no-tablespaces option was introduced in version 5.1.14. + if ($self->_newerThan(5,1,13)) { + $dump_command = $dump_command . " --no-tablespaces"; + } + my $dump_result = system("$dump_command | sort > $file"); return $dump_result; } @@ -582,4 +588,15 @@ return $v < $b; } +sub _newerThan { + my ($self,$b1,$b2,$b3) = @_; + + my ($v1, $v2, $v3) = $self->versionNumbers; + + my $b = $b1*1000 + $b2 * 100 + $b3; + my $v = $v1*1000 + $v2 * 100 + $v3; + + return $v > $b; +} + === modified file 'runall-new.pl' --- runall-new.pl 2010-05-19 13:34:34 +0000 +++ runall-new.pl 2010-08-03 07:19:09 +0000 @@ -367,7 +367,7 @@ my @dump_files; foreach my $i (0..$#server) { - $dump_files[$i] = tmpdir()."/server_".$$."_".$i.".dump"; + $dump_files[$i] = tmpdir()."server_".$$."_".$i.".dump"; my $dump_result = $server[$i]->dumpdb($database,$dump_files[$i]); exit_test($dump_result >> 8) if $dump_result > 0;