diff options
| author | Konstantin Osipov <kostja@sun.com> | 2009-10-22 12:46:07 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2009-10-22 12:46:07 +0400 |
| commit | bd83ad899336c0e4a2212d6f05285c5b94e9f912 (patch) | |
| tree | a95283cd66786801d4ce585e3240e9280e2fd10c /sql/sp_head.cc | |
| parent | 8ec23470f14323bb85220bae42d154681a4be7f3 (diff) | |
| parent | 481066db52cfaa406ea73812bc237513e0daa076 (diff) | |
| download | mariadb-git-bd83ad899336c0e4a2212d6f05285c5b94e9f912.tar.gz | |
Merge with next-mr-runtime.
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 965949223a5..1421c1809bc 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -2378,7 +2378,8 @@ bool check_show_routine_access(THD *thd, sp_head *sp, bool *full_access) bzero((char*) &tables,sizeof(tables)); tables.db= (char*) "mysql"; tables.table_name= tables.alias= (char*) "proc"; - *full_access= (!check_table_access(thd, SELECT_ACL, &tables, 1, TRUE) || + *full_access= (!check_table_access(thd, SELECT_ACL, &tables, FALSE, + 1, TRUE) || (!strcmp(sp->m_definer_user.str, thd->security_ctx->priv_user) && !strcmp(sp->m_definer_host.str, @@ -2824,7 +2825,7 @@ int sp_instr::exec_open_and_lock_tables(THD *thd, TABLE_LIST *tables) Check whenever we have access to tables for this statement and open and lock them before executing instructions core function. */ - if (check_table_access(thd, SELECT_ACL, tables, UINT_MAX, FALSE) + if (check_table_access(thd, SELECT_ACL, tables, FALSE, UINT_MAX, FALSE) || open_and_lock_tables(thd, tables)) result= -1; else |