1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/home/gluh/MySQL/Merge/5.0
This commit is contained in:
gluh@mysql.com 2005-07-19 13:50:55 +05:00
commit 2b1aa257d3
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/information_schema.result
View File

@ -298,6 +298,9 @@ show create function sub2;
Function sql_mode Create Function Function sql_mode Create Function
sub2 CREATE FUNCTION `test`.`sub2`(i int) RETURNS int(11) sub2 CREATE FUNCTION `test`.`sub2`(i int) RETURNS int(11)
return i+1 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; drop function sub2;
show create procedure sel2; show create procedure sel2;
Procedure sql_mode Create Procedure Procedure sql_mode Create Procedure

2
mysql-test/t/information_schema.test
View File

@ -157,6 +157,8 @@ select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES;
show create procedure sel2; show create procedure sel2;
show create function sub1; show create function sub1;
show create function sub2; show create function sub2;
--replace_column 5 # 6 #
show function status like "sub2";
connection default; connection default;
disconnect user1; disconnect user1;
drop function sub2; drop function sub2;

10
sql/sql_parse.cc
View File

@ -2386,10 +2386,12 @@ mysql_execute_command(THD *thd)
select_result *result=lex->result; select_result *result=lex->result;
if (all_tables) if (all_tables)
{ {
res= check_table_access(thd, if (lex->orig_sql_command != SQLCOM_SHOW_STATUS_PROC &&
lex->exchange ? SELECT_ACL | FILE_ACL : lex->orig_sql_command != SQLCOM_SHOW_STATUS_FUNC)
SELECT_ACL, res= check_table_access(thd,
all_tables, 0); lex->exchange ? SELECT_ACL | FILE_ACL :
SELECT_ACL,
all_tables, 0);
} }
else else
res= check_access(thd, res= check_access(thd,