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
dd4b0710
Commit
dd4b0710
authored
Mar 29, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanups during review
parent
7b0e8726
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
ndb/src/ndbapi/DictCache.cpp
ndb/src/ndbapi/DictCache.cpp
+1
-1
sql/sql_acl.cc
sql/sql_acl.cc
+6
-3
sql/sql_yacc.yy
sql/sql_yacc.yy
+1
-1
No files found.
ndb/src/ndbapi/DictCache.cpp
View file @
dd4b0710
...
...
@@ -24,7 +24,7 @@
Ndb_local_table_info
*
Ndb_local_table_info
::
create
(
NdbTableImpl
*
table_impl
,
Uint32
sz
)
{
Uint32
tot_size
=
sizeof
(
NdbTableImpl
*
)
+
((
sz
+
7
)
>>
3
)
<<
3
;
// round to Uint64
Uint32
tot_size
=
sizeof
(
NdbTableImpl
*
)
+
((
sz
+
7
)
&
~
7
)
;
// round to Uint64
void
*
data
=
malloc
(
tot_size
);
if
(
data
==
0
)
return
0
;
...
...
sql/sql_acl.cc
View file @
dd4b0710
...
...
@@ -2729,7 +2729,8 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
pthread_mutex_lock
(
&
acl_cache
->
lock
);
error
=
replace_user_table
(
thd
,
tables
[
0
].
table
,
*
Str
,
0
,
revoke_grant
,
create_new_users
,
thd
->
variables
.
sql_mode
&
MODE_NO_AUTO_CREATE_USER
);
test
(
thd
->
variables
.
sql_mode
&
MODE_NO_AUTO_CREATE_USER
));
pthread_mutex_unlock
(
&
acl_cache
->
lock
);
if
(
error
)
{
...
...
@@ -2935,7 +2936,8 @@ bool mysql_procedure_grant(THD *thd, TABLE_LIST *table_list,
pthread_mutex_lock
(
&
acl_cache
->
lock
);
error
=
replace_user_table
(
thd
,
tables
[
0
].
table
,
*
Str
,
0
,
revoke_grant
,
create_new_users
,
thd
->
variables
.
sql_mode
&
MODE_NO_AUTO_CREATE_USER
);
test
(
thd
->
variables
.
sql_mode
&
MODE_NO_AUTO_CREATE_USER
));
pthread_mutex_unlock
(
&
acl_cache
->
lock
);
if
(
error
)
{
...
...
@@ -3061,7 +3063,8 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
}
if
(
replace_user_table
(
thd
,
tables
[
0
].
table
,
*
Str
,
(
!
db
?
rights
:
0
),
revoke_grant
,
create_new_users
,
thd
->
variables
.
sql_mode
&
MODE_NO_AUTO_CREATE_USER
))
test
(
thd
->
variables
.
sql_mode
&
MODE_NO_AUTO_CREATE_USER
)))
result
=
-
1
;
else
if
(
db
)
{
...
...
sql/sql_yacc.yy
View file @
dd4b0710
...
...
@@ -1398,7 +1398,7 @@ create_function_tail:
uint unused1= 0;
int unused2= 0;
if (!(new_field= new_create_field(YYTHD, "",
if (!(new_field= new_create_field(YYTHD,
(char*)
"",
(enum enum_field_types)$8,
lex->length, lex->dec, lex->type,
(Item *)0, (Item *) 0, &cmt, 0,
...
...
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