mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1

Browse source 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
This commit is contained in:
kent@mysql.com 2005-08-17 03:39:15 +02:00
commit 4e4f40e468
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mysql-test/mysql-test-run.pl
View file

@ -341,7 +341,6 @@ sub main () {
if ( ! $glob_use_running_server ) if ( ! $glob_use_running_server )
{ {
if ( $opt_start_dirty ) if ( $opt_start_dirty )
{ {
kill_running_server(); kill_running_server();
@ -356,7 +355,7 @@ sub main () {
} }
} }
if ( $opt_start_and_exit or $opt_start_dirty ) if ( $opt_start_dirty )
{ {
if ( ndbcluster_start() ) if ( ndbcluster_start() )
{ {
@ -371,9 +370,7 @@ sub main () {
mtr_error("Can't start the mysqld server"); mtr_error("Can't start the mysqld server");
} }
} }
else elsif ( $opt_bench )
{
if ( $opt_bench )
{ {
run_benchmarks(shift); # Shift what? Extra arguments?! run_benchmarks(shift); # Shift what? Extra arguments?!
} }
@ -381,7 +378,6 @@ sub main () {
{ {
run_tests(); run_tests();
} }
}
mtr_exit(0); mtr_exit(0);
} }
@ -1487,6 +1483,16 @@ sub run_testcase ($) {
} }
} }
# ----------------------------------------------------------------------
# If --start-and-exit given, stop here to let user manually run tests
# ----------------------------------------------------------------------
if ( $opt_start_and_exit )
{
mtr_report("\nServers started, exiting");
exit(0);
}
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Run the test case # Run the test case
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@ -2248,7 +2254,8 @@ Misc options
script-debug Debug this script itself script-debug Debug this script itself
compress Use the compressed protocol between client and server compress Use the compressed protocol between client and server
timer Show test case execution time timer Show test case execution time
start-and-exit Only initiate and start the "mysqld" servers 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 start-dirty Only start the "mysqld" servers without initiation
fast Don't try to cleanup from earlier runs fast Don't try to cleanup from earlier runs
reorder Reorder tests to get less server restarts reorder Reorder tests to get less server restarts