Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
5f206cb3
Commit
5f206cb3
authored
Nov 13, 2007
by
istruewing@stella.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into stella.local:/home2/mydev/mysql-5.1-bug31210
parents
f5d1d682
edce8a63
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+1
-0
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+3
-1
No files found.
libmysqld/lib_sql.cc
View file @
5f206cb3
...
@@ -581,6 +581,7 @@ void *create_embedded_thd(int client_flag)
...
@@ -581,6 +581,7 @@ void *create_embedded_thd(int client_flag)
fprintf
(
stderr
,
"store_globals failed.
\n
"
);
fprintf
(
stderr
,
"store_globals failed.
\n
"
);
goto
err
;
goto
err
;
}
}
lex_start
(
thd
);
/* TODO - add init_connect command execution */
/* TODO - add init_connect command execution */
...
...
mysql-test/mysql-test-run.pl
View file @
5f206cb3
...
@@ -3754,7 +3754,9 @@ sub mysqld_arguments ($$$$) {
...
@@ -3754,7 +3754,9 @@ sub mysqld_arguments ($$$$) {
# 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. If not running
# as root it will be ignored, see BUG#30630
# 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
");
mtr_add_arg
(
$args
,
"
%s--user=root
");
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment