diff options
| author | unknown <eric@mysql.com> | 2005-09-14 14:46:07 -0700 |
|---|---|---|
| committer | unknown <eric@mysql.com> | 2005-09-14 14:46:07 -0700 |
| commit | 9d5331c3aae13688859114cc8c73786a81b858eb (patch) | |
| tree | d3157ae691f68a98380266d57a2ae5028bacd31e /sql | |
| parent | 0bba047ab5140cce84ad22a6398928fd512d877c (diff) | |
| parent | 9f631d5f88edbb23e595b253a44e99ab08c28085 (diff) | |
| download | mariadb-git-9d5331c3aae13688859114cc8c73786a81b858eb.tar.gz | |
Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/eric/mysql-5.0-fed-err
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 331d6f773a4..e83530b7239 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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, |