diff options
| author | unknown <kent@mysql.com> | 2005-09-29 03:20:31 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-09-29 03:20:31 +0200 |
| commit | 14650d4f66f9369eedba534a8434fe82c217e66d (patch) | |
| tree | 38ed48baf66a457188a181eeff05f39f32789b9b /mysql-test/lib | |
| parent | f75271a53e2895c45c555f786982ad5120aed96b (diff) | |
| parent | 72340d672d573d21871b385b8ca5edd29e839a9b (diff) | |
| download | mariadb-git-14650d4f66f9369eedba534a8434fe82c217e66d.tar.gz | |
Merge
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
os2/MySQL-Source.icc:
Auto merged
regex/Makefile.am:
Auto merged
regex/engine.c:
Auto merged
regex/main.c:
Auto merged
regex/regerror.c:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 5149d322f7f..0fb4282ce7f 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -680,7 +680,8 @@ sub mtr_mysqladmin_shutdown { mtr_add_arg($args, "shutdown"); # We don't wait for termination of mysqladmin my $pid= mtr_spawn($::exe_mysqladmin, $args, - "", $::path_manager_log, $::path_manager_log, ""); + "", $::path_manager_log, $::path_manager_log, "", + { append_log_file => 1 }); $mysql_admin_pids{$pid}= 1; } |