diff options
| author | unknown <pem@mysql.com> | 2006-01-26 13:29:46 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2006-01-26 13:29:46 +0100 |
| commit | cce719fba8e143c6a94f5c4048e1b72d005b1dd2 (patch) | |
| tree | 42db978805a90eab556fb5ed7c87e15209b14d6b /sql/sql_acl.cc | |
| parent | e43170419c97f5432e90016bc89e0910f39f1487 (diff) | |
| download | mariadb-git-cce719fba8e143c6a94f5c4048e1b72d005b1dd2.tar.gz | |
Fixed BUG#16303: erroneus stored procedures and functions should be droppable
Use a special lookup function for DROP, which doesn't attempt to parse the
definition.
mysql-test/r/sp-destruct.result:
Updated test result for BUG#16303.
mysql-test/t/sp-destruct.test:
Added test case for BUG#16303.
sql/sp.cc:
New function sp_routine_exists_in_table() for DROP PROCEDURE/FUNCTION; which doesn't
want to parse the definition, only know if it exists.
Renamed sp_exists_routine to sp_exist_routines and added comment,
and changed the misnamed parameter/variable 'tables'/'table' to
'routines'/'routine'.
sql/sp.h:
New function sp_routine_exists_in_table() for DROP PROCEDURE/FUNCTION.
Renamed sp_exists_routine to sp_exist_routines,
and changed the misnamed parameter 'tables' to 'routines'.
sql/sql_acl.cc:
Call to sp_exists_routine() renamed to sp_exist_routines().
sql/sql_parse.cc:
Use the new sp_routine_exists_in_table() instead of sp_find_routine(), since we don't
want the routine definition parsed when doing DROP PROCEDURE/FUNCTION.
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 7bc5aac270b..c67ce383398 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -3030,7 +3030,7 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc, if (!revoke_grant) { - if (sp_exists_routine(thd, table_list, is_proc, no_error)<0) + if (sp_exist_routines(thd, table_list, is_proc, no_error)<0) DBUG_RETURN(TRUE); } |