Commit 5f206cb3 authored by istruewing@stella.local's avatar istruewing@stella.local

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines

into  stella.local:/home2/mydev/mysql-5.1-bug31210
parents f5d1d682 edce8a63
......@@ -581,6 +581,7 @@ void *create_embedded_thd(int client_flag)
fprintf(stderr,"store_globals failed.\n");
goto err;
}
lex_start(thd);
/* TODO - add init_connect command execution */
......
......@@ -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");
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment