Commit a63a66cb authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents bf6239c9 0ce5985f

mysql-test/mysql-test-run.pl

+2 −3
Original line number Diff line number Diff line
@@ -3527,11 +3527,10 @@ sub mysqld_arguments ($$$$$) { 
  if ( $glob_use_embedded_server )

  {

    $prefix= "--server-arg=";

  } else {

    # We can't pass embedded server --no-defaults

    mtr_add_arg($args, "--no-defaults");

  }



  mtr_add_arg($args, "%s--no-defaults", $prefix);



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

  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);

  mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);