diff options
| author | unknown <pem@mysql.com> | 2006-02-06 17:58:15 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2006-02-06 17:58:15 +0100 |
| commit | 18aba0411e1d9351e201fd208f9f838158298138 (patch) | |
| tree | 4de7d87d15984a08f05e72262c4409bab4a5159c /sql/sql_parse.cc | |
| parent | 466c30c11f1e102d042506d3eeedc96dabf3dddf (diff) | |
| parent | 5f2b9f4f7c2ce209d45d6d37d72f84f0b6b74f83 (diff) | |
| download | mariadb-git-18aba0411e1d9351e201fd208f9f838158298138.tar.gz | |
Merge mysql.com:/extern/mysql/bk/mysql-5.0
into mysql.com:/extern/mysql/work/bug16303/mysql-5.0
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a61815c8202..978cab704c0 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4445,21 +4445,17 @@ end_with_restore_list: case SQLCOM_DROP_PROCEDURE: case SQLCOM_DROP_FUNCTION: { - sp_head *sp; int result; - char *db, *name; + int type= (lex->sql_command == SQLCOM_DROP_PROCEDURE ? + TYPE_ENUM_PROCEDURE : TYPE_ENUM_FUNCTION); - if (lex->sql_command == SQLCOM_DROP_PROCEDURE) - sp= sp_find_routine(thd, TYPE_ENUM_PROCEDURE, lex->spname, - &thd->sp_proc_cache, FALSE); - else - sp= sp_find_routine(thd, TYPE_ENUM_FUNCTION, lex->spname, - &thd->sp_func_cache, FALSE); + result= sp_routine_exists_in_table(thd, type, lex->spname); mysql_reset_errors(thd, 0); - if (sp) + if (result == SP_OK) { - db= thd->strdup(sp->m_db.str); - name= thd->strdup(sp->m_name.str); + char *db= lex->spname->m_db.str; + char *name= lex->spname->m_name.str; + if (check_routine_access(thd, ALTER_PROC_ACL, db, name, lex->sql_command == SQLCOM_DROP_PROCEDURE, 0)) goto error; |