mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Remove "restart-cleanup" not needed any more as a snapshot of the db will be restored after a failed test case
This commit is contained in:
@@ -166,7 +166,6 @@ our $path_my_basedir;
|
|||||||
our $opt_vardir; # A path but set directly on cmd line
|
our $opt_vardir; # A path but set directly on cmd line
|
||||||
our $opt_vardir_trace; # unix formatted opt_vardir for trace files
|
our $opt_vardir_trace; # unix formatted opt_vardir for trace files
|
||||||
our $opt_tmpdir; # A path but set directly on cmd line
|
our $opt_tmpdir; # A path but set directly on cmd line
|
||||||
our $opt_restart_cleanup; # Source a file with SQL drop statements
|
|
||||||
|
|
||||||
our $opt_usage;
|
our $opt_usage;
|
||||||
our $opt_suite;
|
our $opt_suite;
|
||||||
@@ -661,7 +660,6 @@ sub command_line_setup () {
|
|||||||
'netware' => \$opt_netware,
|
'netware' => \$opt_netware,
|
||||||
'old-master' => \$opt_old_master,
|
'old-master' => \$opt_old_master,
|
||||||
'reorder' => \$opt_reorder,
|
'reorder' => \$opt_reorder,
|
||||||
'restart-cleanup' => \$opt_restart_cleanup,
|
|
||||||
'script-debug' => \$opt_script_debug,
|
'script-debug' => \$opt_script_debug,
|
||||||
'sleep=i' => \$opt_sleep,
|
'sleep=i' => \$opt_sleep,
|
||||||
'socket=s' => \$opt_socket,
|
'socket=s' => \$opt_socket,
|
||||||
@@ -3256,12 +3254,6 @@ sub run_mysqltest ($) {
|
|||||||
mtr_add_arg($args, "--sleep=%d", $opt_sleep);
|
mtr_add_arg($args, "--sleep=%d", $opt_sleep);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $opt_restart_cleanup and $glob_mysqld_restart )
|
|
||||||
{
|
|
||||||
mtr_add_arg($args, "--include=%s", "include/drop-on-restart.inc");
|
|
||||||
$glob_mysqld_restart= 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( $opt_debug )
|
if ( $opt_debug )
|
||||||
{
|
{
|
||||||
mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace", $opt_vardir_trace);
|
mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace", $opt_vardir_trace);
|
||||||
|
Reference in New Issue
Block a user