database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Bug #44561 mtr2 --start-dirty is broken

Browse Source 
start-dirty would remove stored procs etc.
Skip the copying back from stored system dir if using --start-dirty
This commit is contained in:
Bjorn Munch
2009-04-30 13:23:36 +02:00
parent 261066e251
commit cf1845f4da
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/mysql-test-run.pl
View File

@@ -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 )) {
@@ -4503,6 +4503,8 @@ 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 )
{
if (! $opt_start_dirty) # If dirty, keep possibly grown system db
{ {
# Copy datadir from installed system db # Copy datadir from installed system db
for my $path ( "$opt_vardir", "$opt_vardir/..") { for my $path ( "$opt_vardir", "$opt_vardir/..") {
@@ -4513,6 +4515,7 @@ sub start_servers($) {
mtr_error("Failed to copy system db to '$datadir'") mtr_error("Failed to copy system db to '$datadir'")
unless -d $datadir; unless -d $datadir;
} }
}
else else
{ {
mysql_install_db($mysqld); # For versional testing mysql_install_db($mysqld); # For versional testing