diff options
| author | unknown <pem@mysql.comhem.se> | 2003-12-16 14:15:27 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2003-12-16 14:15:27 +0100 |
| commit | 241bb226993b5ea11e73903858b5ba0fdc6e6647 (patch) | |
| tree | 0444674981f96d61fdf0356f9d302bbb2126dc68 /sql/item_func.cc | |
| parent | 1d77c0412ee5875cefaf514df483af38c63356f5 (diff) | |
| download | mariadb-git-241bb226993b5ea11e73903858b5ba0fdc6e6647.tar.gz | |
Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
Added missing cleanup in sp-security.test.
mysql-test/r/sp-security.result:
Added clean-up.
mysql-test/t/sp-security.test:
Added clean-up.
sql/item_func.cc:
Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
sql/sp_head.cc:
Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
sql/sp_head.h:
Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
sql/sql_parse.cc:
Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 428ca5aa90e..442e5c53675 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3069,19 +3069,25 @@ Item_func_sp::execute(Item **itp) { DBUG_ENTER("Item_func_sp::execute"); THD *thd= current_thd; - st_sp_security_context save_ctx; int res; +#ifndef NO_EMBEDDED_ACCESS_CHECKS + st_sp_security_context save_ctx; +#endif if (! m_sp) m_sp= sp_find_function(thd, &m_name); if (! m_sp) DBUG_RETURN(-1); +#ifndef NO_EMBEDDED_ACCESS_CHECKS sp_change_security_context(thd, m_sp, &save_ctx); +#endif res= m_sp->execute_function(thd, args, arg_count, itp); +#ifndef NO_EMBEDDED_ACCESS_CHECKS sp_restore_security_context(thd, m_sp, &save_ctx); +#endif DBUG_RETURN(res); } |