bk commit into 5.0 tree (elliot:1.1958)

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
5.0 repository of emurphy. When emurphy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1958 05/09/14 10:45:30 elliot@stripped +1 -0
  Merge mysql.com:/home/emurphy/src/work/mysql-5.0-bug-12870
  into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.0

  sql/sql_parse.cc
    1.488 05/09/14 10:45:25 elliot@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	elliot
# Host:	desperate.(none)
# Root:	/home/emurphy/src/bk-clean/mysql-5.0/RESYNC

--- 1.487/sql/sql_parse.cc	2005-09-14 05:26:02 -04:00
+++ 1.488/sql/sql_parse.cc	2005-09-14 10:45:25 -04:00
@@ -4029,6 +4029,9 @@
       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 @@
 				 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 &&
@@ -4341,6 +4347,9 @@
 	name= thd->strdup(sp->m_name.str);
 	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 &&