database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Use function 'stop_all_servers' to stop the running servers before restoring snapshot and resuming tests

Browse Source
This commit is contained in:
msvensson@neptunus.(none)
2006-06-10 20:59:14 +02:00
parent 2c538f6cde
commit 0dc04dd7f1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2341,8 +2341,6 @@ sub restore_installed_db ($) {
if ( -d $path_snapshot) if ( -d $path_snapshot)
{ {
kill_running_server ();
mtr_report("Restoring snapshot of databases"); mtr_report("Restoring snapshot of databases");
foreach my $data_dir (@data_dir_lst) foreach my $data_dir (@data_dir_lst)
@ -2367,8 +2365,8 @@ sub restore_installed_db ($) {
} }
else else
{ {
# No snapshot existed, just stop all processes # No snapshot existed
stop_all_servers(); mtr_error("No snapshot existed");
} }
} }
@ -2381,6 +2379,9 @@ sub report_failure_and_restart ($) {
print "\n"; print "\n";
if ( $opt_force ) if ( $opt_force )
{ {
# Stop all servers that are known to be running
stop_all_servers();
# Restore the snapshot of the installed test db # Restore the snapshot of the installed test db
restore_installed_db($tinfo->{'name'}); restore_installed_db($tinfo->{'name'});
print "Resuming Tests\n\n"; print "Resuming Tests\n\n";