database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-5.0-18617

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
This commit is contained in:
jimw@mysql.com
2006-04-26 11:37:53 -07:00
parent 74ca82c857 57980ef4d5
commit e848c7c293
1 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -390,23 +390,8 @@ sub main () {
{ {
gprof_prepare(); gprof_prepare();
} }
if ( $opt_start_dirty ) if ( $opt_bench )
{
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 )
{ {
initialize_servers(); initialize_servers();
run_benchmarks(shift); # Shift what? Extra arguments?! run_benchmarks(shift); # Shift what? Extra arguments?!
@ -2059,10 +2044,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"); mtr_report("\nServers started, exiting");
exit(0); exit(0);
@ -3441,11 +3427,12 @@ Misc options
comment=STR Write STR to the output comment=STR Write STR to the output
script-debug Debug this script itself script-debug Debug this script itself
timer Show test case execution time timer Show test case execution time
start-and-exit Only initiate and start the "mysqld" servers, use the startup start-and-exit Only initialize and start the servers, using the
settings for the specified test case if any startup settings for the specified test case (if any)
start-dirty Only start the "mysqld" servers without initiation start-dirty Only start the servers (without initialization) for
fast Don't try to cleanup from earlier runs the specified test case (if any)
reorder Reorder tests to get less server restarts fast Don't try to clean up from earlier runs
reorder Reorder tests to get fewer server restarts
help Get this help text help Get this help text
unified-diff | udiff When presenting differences, use unified diff unified-diff | udiff When presenting differences, use unified diff