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
32208e02
Commit
32208e02
authored
Mar 12, 2003
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
parents
f16873ec
ce194f04
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
sql/gen_lex_hash.cc
sql/gen_lex_hash.cc
+1
-1
sql/sql_base.cc
sql/sql_base.cc
+4
-3
No files found.
sql/gen_lex_hash.cc
View file @
32208e02
...
...
@@ -274,7 +274,7 @@ void print_arrays()
function_plus
,
function_mod
);
int
*
prva
=
(
int
*
)
my_alloca
(
sizeof
(
int
)
*
function_mod
);
for
(
i
=
0
;
i
<
=
function_mod
;
i
++
)
for
(
i
=
0
;
i
<
function_mod
;
i
++
)
prva
[
i
]
=
max_symbol
;
for
(
i
=
0
;
i
<
size
;
i
++
)
...
...
sql/sql_base.cc
View file @
32208e02
...
...
@@ -1616,7 +1616,7 @@ Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length,
else
thd
->
dupp_field
=
field
;
}
if
(
check_grants
&&
!
thd
->
master_access
&&
check_grant_column
(
thd
,
table
,
name
,
length
))
if
(
check_grants
&&
check_grant_column
(
thd
,
table
,
name
,
length
))
return
WRONG_GRANT
;
return
field
;
}
...
...
@@ -1643,7 +1643,8 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables)
{
found_table
=
1
;
Field
*
find
=
find_field_in_table
(
thd
,
tables
->
table
,
name
,
length
,
grant_option
&&
!
thd
->
master_access
,
1
);
grant_option
&&
tables
->
grant
.
want_privilege
,
1
);
if
(
find
)
{
if
(
find
==
WRONG_GRANT
)
...
...
@@ -1682,7 +1683,7 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables)
for
(;
tables
;
tables
=
tables
->
next
)
{
Field
*
field
=
find_field_in_table
(
thd
,
tables
->
table
,
name
,
length
,
grant_option
&&
!
thd
->
master_access
,
allow_rowid
);
grant_option
&&
tables
->
grant
.
want_privilege
,
allow_rowid
);
if
(
field
)
{
if
(
field
==
WRONG_GRANT
)
...
...
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