database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql.com:/home/emurphy/src/work/mysql-5.0-bug-12870

Browse Source 
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
This commit is contained in:
elliot@mysql.com
2005-09-14 14:44:48 -04:00
parent a42b5000ca 8e7e17166c
commit 86882cc8f9
3 changed files with 243 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_parse.cc
View File

@@ -4029,6 +4029,9 @@ end_with_restore_list:
goto error;
}
if (end_active_trans(thd))
goto error;
if (!lex->sphead->m_db.str || !lex->sphead->m_db.str[0])
{
lex->sphead->m_db.length= strlen(thd->db);
@@ -4283,6 +4286,9 @@ end_with_restore_list:
sp->m_name.str,
lex->sql_command == SQLCOM_ALTER_PROCEDURE, 0))
goto error;
if (end_active_trans(thd))
goto error;
memcpy(&lex->sp_chistics, &chistics, sizeof(lex->sp_chistics));
if (!trust_routine_creators && mysql_bin_log.is_open() &&
!sp->m_chistics->detistic &&
@@ -4342,6 +4348,9 @@ end_with_restore_list:
if (check_routine_access(thd, ALTER_PROC_ACL, db, name,
lex->sql_command == SQLCOM_DROP_PROCEDURE, 0))
goto error;
if (end_active_trans(thd))
goto error;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
if (sp_automatic_privileges && !opt_noacl &&
sp_revoke_privileges(thd, db, name,