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
1b602c3d
Commit
1b602c3d
authored
Jun 09, 2005
by
brian@brian-akers-computer.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
parents
36a4f39b
2d9c00b2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
sql/log_event.cc
sql/log_event.cc
+1
-1
sql/sql_acl.cc
sql/sql_acl.cc
+2
-2
No files found.
sql/log_event.cc
View file @
1b602c3d
...
@@ -707,7 +707,7 @@ failed my_b_read"));
...
@@ -707,7 +707,7 @@ failed my_b_read"));
Log_event
*
res
=
0
;
Log_event
*
res
=
0
;
#ifndef max_allowed_packet
#ifndef max_allowed_packet
THD
*
thd
=
current_thd
;
THD
*
thd
=
current_thd
;
uint
max_allowed_packet
=
thd
?
thd
->
variables
.
max_allowed_packet
:
~
0
;
uint
max_allowed_packet
=
thd
?
thd
->
variables
.
max_allowed_packet
:
~
(
ulong
)
0
;
#endif
#endif
if
(
data_len
>
max_allowed_packet
)
if
(
data_len
>
max_allowed_packet
)
...
...
sql/sql_acl.cc
View file @
1b602c3d
...
@@ -5172,7 +5172,7 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list)
...
@@ -5172,7 +5172,7 @@ bool mysql_revoke_all(THD *thd, List <LEX_USER> &list)
grant_proc
->
db
,
grant_proc
->
db
,
grant_proc
->
tname
,
grant_proc
->
tname
,
is_proc
,
is_proc
,
~
0
,
1
))
~
(
ulong
)
0
,
1
))
{
{
revoked
=
1
;
revoked
=
1
;
continue
;
continue
;
...
@@ -5240,7 +5240,7 @@ bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name,
...
@@ -5240,7 +5240,7 @@ bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name,
lex_user
.
host
.
length
=
strlen
(
grant_proc
->
host
.
hostname
);
lex_user
.
host
.
length
=
strlen
(
grant_proc
->
host
.
hostname
);
if
(
!
replace_routine_table
(
thd
,
grant_proc
,
tables
[
4
].
table
,
lex_user
,
if
(
!
replace_routine_table
(
thd
,
grant_proc
,
tables
[
4
].
table
,
lex_user
,
grant_proc
->
db
,
grant_proc
->
tname
,
grant_proc
->
db
,
grant_proc
->
tname
,
is_proc
,
~
0
,
1
))
is_proc
,
~
(
ulong
)
0
,
1
))
{
{
revoked
=
1
;
revoked
=
1
;
continue
;
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