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

Bug #18617: mysql-test-run.pl, partially wrong handling of option "start-dirty"

Browse Source 
This was a case of too much code. The --start-dirty option should act
  just like --start-and-exit, except it skips the database initialization
  step. Now it does, which means it picks up the options from the specified
  test case.
This commit is contained in:
jimw@mysql.com
2006-04-20 19:17:14 -07:00
parent b57eb9e17c
commit 57980ef4d5
1 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,22 +407,7 @@ sub main () {
}
}
if ( $opt_start_dirty )
{
if ( ndbcluster_start($opt_with_ndbcluster) )
{
mtr_error("Can't start ndbcluster");
}
if ( mysqld_start('master',0,[],[],$using_ndbcluster_master) )
{
mtr_report("Servers started, exiting");
}
else
{
mtr_error("Can't start the mysqld server");
}
}
elsif ( $opt_bench )
if ( $opt_bench )
{
run_benchmarks(shift); # Shift what? Extra arguments?!
}
@ -2027,10 +2012,11 @@ sub run_testcase ($) {
}
# ----------------------------------------------------------------------
# If --start-and-exit given, stop here to let user manually run tests
# If --start-and-exit or --start-dirty given, stop here to let user manually
# run tests
# ----------------------------------------------------------------------
if ( $opt_start_and_exit )
if ( $opt_start_and_exit or $opt_start_dirty )
{
mtr_report("\nServers started, exiting");
exit(0);
@ -3409,11 +3395,12 @@ Misc options
comment=STR Write STR to the output
script-debug Debug this script itself
timer Show test case execution time
start-and-exit Only initiate and start the "mysqld" servers, use the startup
settings for the specified test case if any
start-dirty Only start the "mysqld" servers without initiation
fast Don't try to cleanup from earlier runs
reorder Reorder tests to get less server restarts
start-and-exit Only initialize and start the servers, using the
startup settings for the specified test case (if any)
start-dirty Only start the servers (without initialization) for
the specified test case (if any)
fast Don't try to clean up from earlier runs
reorder Reorder tests to get fewer server restarts
help Get this help text
unified-diff | udiff When presenting differences, use unified diff