bk commit into 5.1 tree (mkindahl:1.2536)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-06 06:18:06+01:00, mkindahl@stripped +1 -0
  Removing duplicate code from mysql-test-run.pl

  mysql-test/mysql-test-run.pl@stripped, 2008-02-06 06:17:56+01:00, mkindahl@stripped +0 -8
    Removing duplicate code.

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-01-31 16:31:38 +01:00
+++ b/mysql-test/mysql-test-run.pl	2008-02-06 06:17:56 +01:00
@@ -3870,14 +3870,6 @@ sub mysqld_arguments ($$$$) {
     mtr_add_arg($args, "%s--user=root");
   }
 
-  # When mysqld is run by a root user(euid is 0), it will fail
-  # to start unless we specify what user to run as, see BUG#30630
-  my $euid= $>;
-  if (!$glob_win32 and $euid == 0 and
-      (grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt)) == 0) {
-    mtr_add_arg($args, "%s--user=root", $prefix);
-  }
-
   if ( $opt_valgrind_mysqld )
   {
     mtr_add_arg($args, "%s--skip-safemalloc", $prefix);