diff options
| author | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2004-12-23 11:42:57 +0000 |
|---|---|---|
| committer | unknown <acurtis@pcgem.rdg.cyberkinetica.com> | 2004-12-23 11:42:57 +0000 |
| commit | dd6981f4d01072cbc5fa898bd6c42b54ffbb0fcf (patch) | |
| tree | 6295d6754d93b42771a846ba1974f507ba512809 /sql/sql_parse.cc | |
| parent | 0cc6e44707e7e76afcc96979e613368ee9075abb (diff) | |
| download | mariadb-git-dd6981f4d01072cbc5fa898bd6c42b54ffbb0fcf.tar.gz | |
Fix for embedded
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 80639e06f5f..1e232f064ba 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3770,6 +3770,7 @@ create_error: lex->unit.cleanup(); delete lex->sphead; lex->sphead= 0; +#ifndef NO_EMBEDDED_ACCESS_CHECKS /* only add privileges if really neccessary */ if (sp_automatic_privileges && check_procedure_access(thd, DEFAULT_CREATE_PROC_ACLS, @@ -3781,6 +3782,7 @@ create_error: ER_PROC_AUTO_GRANT_FAIL, ER(ER_PROC_AUTO_GRANT_FAIL)); } +#endif send_ok(thd); break; case SP_WRITE_ROW_FAILED: @@ -3956,6 +3958,7 @@ create_error: name= thd->strdup(sp->m_name.str); if (check_procedure_access(thd, ALTER_PROC_ACL, db, name, 0)) goto error; +#ifndef NO_EMBEDDED_ACCESS_CHECKS if (sp_automatic_privileges && sp_revoke_privileges(thd, db, name)) { @@ -3963,6 +3966,7 @@ create_error: ER_PROC_AUTO_REVOKE_FAIL, ER(ER_PROC_AUTO_REVOKE_FAIL)); } +#endif if (lex->sql_command == SQLCOM_DROP_PROCEDURE) result= sp_drop_procedure(thd, lex->spname); else @@ -4383,8 +4387,10 @@ check_procedure_access(THD *thd, ulong want_access,char *db, char *name, 0, no_errors)) return TRUE; +#ifndef NO_EMBEDDED_ACCESS_CHECKS if (grant_option) return check_grant_procedure(thd, want_access, tables, no_errors); +#endif return FALSE; } |