Commit 76833ac4 authored by unknown's avatar unknown
Browse files

A fix for Bug#24486 "Valgrind warnings: sp_head(), 

deadlock_innodb:events_grant". This was a memory leak introduced by 
the patch for Bug 22830.
Post-review fixes.


sql/sql_parse.cc:
  A fix for Bug#24486 "Valgrind warnings: sp_head(),
   deadlock_innodb:events_grant": delete the sphead object before
  returning with an error.
parent 49009cf8

sql/sql_parse.cc

+9 −9
Original line number Diff line number Diff line
@@ -3925,6 +3925,7 @@ mysql_execute_command(THD *thd) 
  }

  case SQLCOM_CREATE_EVENT:

  case SQLCOM_ALTER_EVENT:

  do

  {

    DBUG_ASSERT(lex->event_parse_data);

    if (lex->table_or_sp_used())
@@ -3950,16 +3951,15 @@ mysql_execute_command(THD *thd) 
    if (!res)

      send_ok(thd);



  } while (0);

  /* Don't do it, if we are inside a SP */

  if (!thd->spcont)

  {

    delete lex->sphead;

    lex->sphead= NULL;

  }



  /* lex->unit.cleanup() is called outside, no need to call it here */

  break;

  }

  case SQLCOM_DROP_EVENT:

  case SQLCOM_SHOW_CREATE_EVENT:

  {