diff options
| author | unknown <acurtis@xiphis.org> | 2005-05-17 19:54:20 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-05-17 19:54:20 +0100 |
| commit | 55171821d238704a8b43a7ba4d150384f9ea70e1 (patch) | |
| tree | 09011cb747c8c1ed831bf8ca66668d0aa4f2610a /sql/sql_show.cc | |
| parent | 9b07cafe1e7a1230218c06f85b88f68b5741c9ef (diff) | |
| download | mariadb-git-55171821d238704a8b43a7ba4d150384f9ea70e1.tar.gz | |
Bug#10246 - Parser: bad syntax for GRANT EXECUTE
Rename some functions
more fine-grained sp privileges
make grant/revoke sp grammar less ambigious
mysql-test/r/sp-security.result:
change test for new syntax
mysql-test/r/system_mysql_db.result:
change test for new syntax
mysql-test/t/sp-security.test:
change test for new syntax
scripts/mysql_create_system_tables.sh:
now store routine_type for procs_priv
scripts/mysql_fix_privilege_tables.sql:
now store routine_type for procs_priv
sql/item_func.cc:
rename of function
sql/mysql_priv.h:
rename of function
sql/sp_head.cc:
extra arg for check_some_routine_access
sql/sql_acl.cc:
rename of function. now handle func/proc acls seperately
sql/sql_acl.h:
rename of function
sql/sql_parse.cc:
rename of function
grants for procs handled distinctly from funcs
sql/sql_show.cc:
check_some_routine_access extra arg
sql/sql_base.cc:
fix for build
sql/sql_yacc.yy:
fix for build
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 686060d1740..1160267732b 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2625,7 +2625,8 @@ bool store_schema_proc(THD *thd, TABLE *table, TABLE *proc_table, definer= get_field(thd->mem_root, proc_table->field[11]); if (!full_access) full_access= !strcmp(sp_user, definer); - if (!full_access && check_some_routine_access(thd, sp_db, sp_name)) + if (!full_access && check_some_routine_access(thd, sp_db, sp_name, + proc_table->field[2]->val_int() == TYPE_ENUM_PROCEDURE)) return 0; if (lex->orig_sql_command == SQLCOM_SHOW_STATUS_PROC && |