mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Apply patch for BUG#30630
This commit is contained in:
@ -3790,10 +3790,11 @@ sub mysqld_arguments ($$$$) {
|
|||||||
mtr_add_arg($args, "%s--connect-timeout=60", $prefix);
|
mtr_add_arg($args, "%s--connect-timeout=60", $prefix);
|
||||||
|
|
||||||
# When mysqld is run by a root user(euid is 0), it will fail
|
# 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
|
# to start unless we specify what user to run as, see BUG#30630
|
||||||
# as root it will be ignored, see BUG#30630
|
my $euid= $>;
|
||||||
if (!(grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt))) {
|
if (!$glob_win32 and $euid == 0 and
|
||||||
mtr_add_arg($args, "%s--user=root");
|
(grep(/^--user/, @$extra_opt, @opt_extra_mysqld_opt)) == 0) {
|
||||||
|
mtr_add_arg($args, "%s--user=root", $prefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $opt_valgrind_mysqld )
|
if ( $opt_valgrind_mysqld )
|
||||||
|
Reference in New Issue
Block a user