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

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


sql/sql_parse.cc:
  Auto merged

sql/sql_parse.cc

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