summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorunknown <istruewing@stella.local>2007-11-13 10:25:22 +0100
committerunknown <istruewing@stella.local>2007-11-13 10:25:22 +0100
commitfca6284c5fbfd51d02086abca9e77ee406819e76 (patch)
treed5e0ea62b3a57756ae1e5a7982b04a2dad2736e8 /mysql-test/mysql-test-run.pl
parent71328b4f13931519832ba4e8b10f6aa1f7dbbfa8 (diff)
downloadmariadb-git-fca6284c5fbfd51d02086abca9e77ee406819e76.tar.gz
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: 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().
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c3312dce3ac..f6ea5550007 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -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");
}