1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  bodhi.local:/opt/local/work/mysql-5.1-24486


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown 2006-11-28 21:58:08 +03:00
commit fe99bda872
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_parse.cc
View File

@ -3968,6 +3968,7 @@ end_with_restore_list:
} }
case SQLCOM_CREATE_EVENT: case SQLCOM_CREATE_EVENT:
case SQLCOM_ALTER_EVENT: case SQLCOM_ALTER_EVENT:
do
{ {
DBUG_ASSERT(lex->event_parse_data); DBUG_ASSERT(lex->event_parse_data);
if (lex->table_or_sp_used()) if (lex->table_or_sp_used())
@ -3993,16 +3994,15 @@ end_with_restore_list:
if (!res) if (!res)
send_ok(thd); send_ok(thd);
/* Don't do it, if we are inside a SP */ } while (0);
if (!thd->spcont) /* Don't do it, if we are inside a SP */
{ if (!thd->spcont)
delete lex->sphead; {
lex->sphead= NULL; delete lex->sphead;
} lex->sphead= NULL;
/* lex->unit.cleanup() is called outside, no need to call it here */
break;
} }
/* lex->unit.cleanup() is called outside, no need to call it here */
break;
case SQLCOM_DROP_EVENT: case SQLCOM_DROP_EVENT:
case SQLCOM_SHOW_CREATE_EVENT: case SQLCOM_SHOW_CREATE_EVENT:
{ {