diff options
author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-02-11 13:57:43 +0100 |
---|---|---|
committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-02-11 13:57:43 +0100 |
commit | ee0329210791ca815f794b68ce4da4b02d8ef73a (patch) | |
tree | 8b5acabebf2222297f145c5900b1c32d4ab76712 | |
parent | 1f97527aaa6199f7b61934df42c1371373349b22 (diff) | |
parent | 445596a12c85f736a6b2ba121bc54bc6cf16d4c6 (diff) | |
download | mariadb-git-ee0329210791ca815f794b68ce4da4b02d8ef73a.tar.gz |
merge 47389
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a2ea36aa34e..07797410188 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1482,6 +1482,12 @@ sub collect_mysqld_features { mtr_add_arg($args, "--verbose"); mtr_add_arg($args, "--help"); + # Need --user=root if running as *nix root user + if (!IS_WINDOWS and $> == 0) + { + mtr_add_arg($args, "--user=root"); + } + my $exe_mysqld= find_mysqld($basedir); my $cmd= join(" ", $exe_mysqld, @$args); my $list= `$cmd`; |