bk commit into 5.1 tree (kostja:1.2374) BUG#22830

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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@stripped, 2006-11-28 20:40:16+03:00, kostja@stripped +1 -0
  A fix for a memory leak itroduced by a fix for Bug#22830,
  reported as Bug#24486 "Valgrind warnings: sp_head(), 
  deadlock_innodb:events_grant".

  sql/sql_parse.cc@stripped, 2006-11-28 20:40:11+03:00, kostja@stripped +5 -0
    A fix for Bug#24486 "Valgrind warnings: sp_head(),
     deadlock_innodb:events_grant": delete the sphead object before
    returning with an error.

# 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:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.1-24486

--- 1.595/sql/sql_parse.cc	2006-11-28 20:40:26 +03:00
+++ 1.596/sql/sql_parse.cc	2006-11-28 20:40:26 +03:00
@@ -3929,6 +3929,11 @@ end_with_restore_list:
     DBUG_ASSERT(lex->event_parse_data);
     if (lex->table_or_sp_used())
     {
+      if (!thd->spcont)           /* Don't do it, if we are inside a SP */
+      {
+        delete lex->sphead;
+        lex->sphead= NULL;
+      }
       my_error(ER_NOT_SUPPORTED_YET, MYF(0), "Usage of subqueries or stored "
                "function calls as part of this statement");
       break;