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

merged

Browse Source
This commit is contained in:
serg@serg.mylan
2005-09-21 13:53:22 +02:00
parent 23f35495ac f6b8032af5
commit a083ff160e
19 changed files with 508 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2450,11 +2450,6 @@ sub run_mysqltest ($) {
mtr_add_arg($args, "--big-test");
}
if ( $opt_record )
{
mtr_add_arg($args, "--record");
}
if ( $opt_compress )
{
mtr_add_arg($args, "--compress");
@ -2480,9 +2475,6 @@ sub run_mysqltest ($) {
$glob_mysql_test_dir);
}
mtr_add_arg($args, "-R");
mtr_add_arg($args, $tinfo->{'result_file'});
# ----------------------------------------------------------------------
# If embedded server, we create server args to give mysqltest to pass on
# ----------------------------------------------------------------------
@ -2497,6 +2489,18 @@ sub run_mysqltest ($) {
# ----------------------------------------------------------------------
$ENV{'MYSQL_TEST'}= "$exe_mysqltest " . join(" ", @$args);
# ----------------------------------------------------------------------
# Add args that should not go into the MYSQL_TEST environment var
# ----------------------------------------------------------------------
mtr_add_arg($args, "-R");
mtr_add_arg($args, $tinfo->{'result_file'});
if ( $opt_record )
{
mtr_add_arg($args, "--record");
}
return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");
}