database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-15 00:02:46 +03:00
Code Activity

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

Browse Source 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2006-11-29 10:21:13 +01:00
parent 95b7215869 fe99bda872
commit b51cf26629
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_parse.cc
View File

@ -3972,6 +3972,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())
@ -3997,16 +3998,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:
{ {