summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorunknown <df@pippilotta.erinye.com>2007-10-30 15:39:02 +0100
committerunknown <df@pippilotta.erinye.com>2007-10-30 15:39:02 +0100
commit173d8d792633bbf75fcd051d54ecd16b72081eeb (patch)
tree501777c2eb8e485f3f17f92174820e9e48ad6934 /mysql-test/mysql-test-run.pl
parentbd00ccb710146a1cbdca9e1465c39add54a74dcd (diff)
parent2f0838d575cd2c41d08c3dd2713fd1abe5ed3a5d (diff)
downloadmariadb-git-173d8d792633bbf75fcd051d54ecd16b72081eeb.tar.gz
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build mysql-test/mysql-test-run.pl: Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index eda268bcedf..c3312dce3ac 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3751,6 +3751,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);