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
820f14b1
Commit
820f14b1
authored
Aug 02, 2006
by
tsmith/tim@siva.hindu.god
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into siva.hindu.god:/usr/home/tim/m/bk/done/b20402-41
parents
dd5eeaf6
f5764cec
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
16 deletions
+1
-16
sql/slave.cc
sql/slave.cc
+1
-1
sql/sql_acl.cc
sql/sql_acl.cc
+0
-15
No files found.
sql/slave.cc
View file @
820f14b1
...
...
@@ -2946,7 +2946,7 @@ static int exec_relay_log_event(THD* thd, RELAY_LOG_INFO* rli)
rli
->
is_until_satisfied
())
{
char
buf
[
22
];
sql_print_
error
(
"Slave SQL thread stopped because it reached its"
sql_print_
information
(
"Slave SQL thread stopped because it reached its"
" UNTIL position %s"
,
llstr
(
rli
->
until_pos
(),
buf
));
/*
Setting abort_slave flag because we do not want additional message about
...
...
sql/sql_acl.cc
View file @
820f14b1
...
...
@@ -3671,17 +3671,11 @@ int mysql_drop_user(THD *thd, List <LEX_USER> &list)
{
if
(
!
(
acl_user
=
check_acl_user
(
user_name
,
&
counter
)))
{
sql_print_error
(
"DROP USER: Can't drop user: '%s'@'%s'; No such user"
,
user_name
->
user
.
str
,
user_name
->
host
.
str
);
result
=
-
1
;
continue
;
}
if
((
acl_user
->
access
&
~
0
))
{
sql_print_error
(
"DROP USER: Can't drop user: '%s'@'%s'; Global privileges exists"
,
user_name
->
user
.
str
,
user_name
->
host
.
str
);
result
=
-
1
;
continue
;
}
...
...
@@ -3702,9 +3696,6 @@ int mysql_drop_user(THD *thd, List <LEX_USER> &list)
}
if
(
counter
!=
acl_dbs
.
elements
)
{
sql_print_error
(
"DROP USER: Can't drop user: '%s'@'%s'; Database privileges exists"
,
user_name
->
user
.
str
,
user_name
->
host
.
str
);
result
=
-
1
;
continue
;
}
...
...
@@ -3725,9 +3716,6 @@ int mysql_drop_user(THD *thd, List <LEX_USER> &list)
}
if
(
counter
!=
column_priv_hash
.
records
)
{
sql_print_error
(
"DROP USER: Can't drop user: '%s'@'%s'; Table privileges exists"
,
user_name
->
user
.
str
,
user_name
->
host
.
str
);
result
=
-
1
;
continue
;
}
...
...
@@ -3793,9 +3781,6 @@ int mysql_revoke_all(THD *thd, List <LEX_USER> &list)
{
if
(
!
check_acl_user
(
lex_user
,
&
counter
))
{
sql_print_error
(
"REVOKE ALL PRIVILEGES, GRANT: User '%s'@'%s' not exists"
,
lex_user
->
user
.
str
,
lex_user
->
host
.
str
);
result
=
-
1
;
continue
;
}
...
...
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