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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
f1496eb6
Commit
f1496eb6
authored
Apr 14, 2005
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG#9455 mysqladmin status crash the server
- Send error to client when mysql_change_db fails.
parent
32221d9b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
sql/sql_db.cc
sql/sql_db.cc
+3
-0
sql/sql_parse.cc
sql/sql_parse.cc
+6
-2
No files found.
sql/sql_db.cc
View file @
f1496eb6
...
...
@@ -1009,6 +1009,9 @@ err:
replication slave SQL thread (for that thread, setting of thd->db is done
in ::exec_event() methods of log_event.cc).
This function does not send the error message to the client, if that
should be sent to the client, call net_send_error after this function
RETURN VALUES
0 ok
1 error
...
...
sql/sql_parse.cc
View file @
f1496eb6
...
...
@@ -260,13 +260,15 @@ int check_user(THD *thd, enum enum_server_command command,
#ifdef NO_EMBEDDED_ACCESS_CHECKS
thd
->
master_access
=
GLOBAL_ACLS
;
// Full rights
/* Change database if necessary
: OK or FAIL is sent in mysql_change_db
*/
/* Change database if necessary */
if
(
db
&&
db
[
0
])
{
thd
->
db
=
0
;
thd
->
db_length
=
0
;
if
(
mysql_change_db
(
thd
,
db
))
{
/* Send the error to the client */
net_send_error
(
thd
);
if
(
thd
->
user_connect
)
decrease_user_connections
(
thd
->
user_connect
);
DBUG_RETURN
(
-
1
);
...
...
@@ -395,11 +397,13 @@ int check_user(THD *thd, enum enum_server_command command,
check_for_max_user_connections
(
thd
,
thd
->
user_connect
))
DBUG_RETURN
(
-
1
);
/* Change database if necessary
: OK or FAIL is sent in mysql_change_db
*/
/* Change database if necessary */
if
(
db
&&
db
[
0
])
{
if
(
mysql_change_db
(
thd
,
db
))
{
/* Send error to the client */
net_send_error
(
thd
);
if
(
thd
->
user_connect
)
decrease_user_connections
(
thd
->
user_connect
);
DBUG_RETURN
(
-
1
);
...
...
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