From f6ffb2cf8ce71a25717896d35158a8094cb85238 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Thu, 1 Nov 2007 19:40:27 +0100
Subject: [PATCH] Bug#30630 mysql-test-run all tests fail with MySQL 5.0.41 &
 5.0.45 on Mac OS X Server 10.5

---
 mysql-test/mysql-test-run.pl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b81d2eb0019..b123c377ce7 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3727,6 +3727,16 @@ 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
+  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");
+  }
+
   if ( $opt_valgrind_mysqld )
   {
     mtr_add_arg($args, "%s--skip-safemalloc", $prefix);