Commit cf1845f4 authored by Bjorn Munch's avatar Bjorn Munch

Bug #44561 mtr2 --start-dirty is broken

start-dirty would remove stored procs etc.
Skip the copying back from stored system dir if using --start-dirty
parent 261066e2
...@@ -3202,7 +3202,7 @@ sub run_testcase ($) { ...@@ -3202,7 +3202,7 @@ sub run_testcase ($) {
{ {
# Remove old datadirs # Remove old datadirs
clean_datadir(); clean_datadir() unless $opt_start_dirty;
# Restore old ENV # Restore old ENV
while (my ($option, $value)= each( %old_env )) { while (my ($option, $value)= each( %old_env )) {
...@@ -4504,14 +4504,17 @@ sub start_servers($) { ...@@ -4504,14 +4504,17 @@ sub start_servers($) {
my $mysqld_basedir= $mysqld->value('basedir'); my $mysqld_basedir= $mysqld->value('basedir');
if ( $basedir eq $mysqld_basedir ) if ( $basedir eq $mysqld_basedir )
{ {
# Copy datadir from installed system db if (! $opt_start_dirty) # If dirty, keep possibly grown system db
for my $path ( "$opt_vardir", "$opt_vardir/..") { {
my $install_db= "$path/install.db"; # Copy datadir from installed system db
copytree($install_db, $datadir) for my $path ( "$opt_vardir", "$opt_vardir/..") {
if -d $install_db; my $install_db= "$path/install.db";
copytree($install_db, $datadir)
if -d $install_db;
}
mtr_error("Failed to copy system db to '$datadir'")
unless -d $datadir;
} }
mtr_error("Failed to copy system db to '$datadir'")
unless -d $datadir;
} }
else else
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment