Commit 220add03 authored by df@pippilotta.erinye.com's avatar df@pippilotta.erinye.com
Browse files

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
parents 9fee3fb6 e5b80933

mysql-test/mysql-test-run.pl

+7 −0
Original line number Diff line number Diff line
@@ -3715,6 +3715,13 @@ sub mysqld_arguments ($$$$) { 
  # see BUG#28359

  mtr_add_arg($args, "%s--connect-timeout=60", $prefix);



  # When mysqld is run by a root user(euid is 0), it will fail

  # to start unless we specify what user to run as. If not running

  # as root it will be ignored, see BUG#30630

  if (!(grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt))) {

    mtr_add_arg($args, "%s--user=root");

  }



  if ( $opt_valgrind_mysqld )

  {

    mtr_add_arg($args, "%s--skip-safemalloc", $prefix);