Commit 5dad8182 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
parents 9d3d2924 fe99bda8

sql/sql_parse.cc

+9 −9
Original line number Diff line number Diff line
@@ -3968,6 +3968,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())
@@ -3993,16 +3994,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:

  {