Commit a0bb290b authored by unknown's avatar unknown

Merge trift2.:/MySQL/M51/mysql-5.1

into  trift2.:/MySQL/M51/push-5.1
parents 722b5cba 79e7d778
......@@ -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);
/* 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;
} 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:
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment