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
b8497024
Commit
b8497024
authored
Jul 19, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0
parents
42b35721
11ff7b16
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
mysql-test/r/information_schema.result
mysql-test/r/information_schema.result
+3
-0
mysql-test/t/information_schema.test
mysql-test/t/information_schema.test
+2
-0
sql/sql_parse.cc
sql/sql_parse.cc
+6
-4
No files found.
mysql-test/r/information_schema.result
View file @
b8497024
...
...
@@ -298,6 +298,9 @@ show create function sub2;
Function sql_mode Create Function
sub2 CREATE FUNCTION `test`.`sub2`(i int) RETURNS int(11)
return i+1
show function status like "sub2";
Db Name Type Definer Modified Created Security_type Comment
test sub2 FUNCTION mysqltest_1@localhost # # DEFINER
drop function sub2;
show create procedure sel2;
Procedure sql_mode Create Procedure
...
...
mysql-test/t/information_schema.test
View file @
b8497024
...
...
@@ -157,6 +157,8 @@ select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES;
show
create
procedure
sel2
;
show
create
function
sub1
;
show
create
function
sub2
;
--
replace_column
5
# 6 #
show
function
status
like
"sub2"
;
connection
default
;
disconnect
user1
;
drop
function
sub2
;
...
...
sql/sql_parse.cc
View file @
b8497024
...
...
@@ -2386,10 +2386,12 @@ mysql_execute_command(THD *thd)
select_result
*
result
=
lex
->
result
;
if
(
all_tables
)
{
res
=
check_table_access
(
thd
,
lex
->
exchange
?
SELECT_ACL
|
FILE_ACL
:
SELECT_ACL
,
all_tables
,
0
);
if
(
lex
->
orig_sql_command
!=
SQLCOM_SHOW_STATUS_PROC
&&
lex
->
orig_sql_command
!=
SQLCOM_SHOW_STATUS_FUNC
)
res
=
check_table_access
(
thd
,
lex
->
exchange
?
SELECT_ACL
|
FILE_ACL
:
SELECT_ACL
,
all_tables
,
0
);
}
else
res
=
check_access
(
thd
,
...
...
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