bk commit into 5.1 tree (istruewing:1.2615) BUG#32078

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing 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, 2007-11-13 10:25:22+01:00, istruewing@stripped +1 -0
  Bug#32078 - Excessive warnings: One can only use the --user switch
              if running as root
  
  Every start of a server in the test suite raised that warning.
  
  The cause was an unconditionla add of the --user option to the
  server command line. Only the "root" user (effective user id == 0)
  must use that option.
  
  Added check for effective user id == 0 before adding --user.
  
  Thanks to Magnus Svensson for the patch.

  mysql-test/mysql-test-run.pl@stripped, 2007-11-13 10:25:20+01:00, istruewing@stripped +3 -1
    Bug#32078 - Excessive warnings: One can only use the --user switch
                if running as root
    Added check for effective user id == 0 before adding --user
    in mysqld_arguments().

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-10-30 15:38:40 +01:00
+++ b/mysql-test/mysql-test-run.pl	2007-11-13 10:25:20 +01:00
@@ -3754,7 +3754,9 @@ sub mysqld_arguments ($$$$) {
   # 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))) {
+  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");
   }