Merge mysql.com:/usr/local/bk/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0-merge

sql/sql_parse.cc

@@ -3584,21 +3584,25 @@ purposes internal to the MySQL server", MYF(0));
     switch (res) {
     case SP_OK:
       send_ok(thd);
+      lex->unit.cleanup();
       delete lex->sphead;
       lex->sphead= 0;
       break;
     case SP_WRITE_ROW_FAILED:
       net_printf(thd, ER_SP_ALREADY_EXISTS, SP_TYPE_STRING(lex), name);
+      lex->unit.cleanup();
       delete lex->sphead;
       lex->sphead= 0;
       goto error;
     case SP_NO_DB_ERROR:
       net_printf(thd, ER_BAD_DB_ERROR, lex->sphead->m_db.str);
+      lex->unit.cleanup();
       delete lex->sphead;
       lex->sphead= 0;
       goto error;
     default:
       net_printf(thd, ER_SP_STORE_FAILED, SP_TYPE_STRING(lex), name);
+      lex->unit.cleanup();
       delete lex->sphead;
       lex->sphead= 0;
       goto error;

sql/sql_yacc.yy

@@ -6573,6 +6573,7 @@ keyword:
 	| INNOBASE_SYM		{}
 	| INSERT_METHOD		{}
 	| RELAY_THREAD		{}
+	| LABEL_SYM             {}
 	| LANGUAGE_SYM          {}
 	| LAST_SYM		{}
 	| LEAVES                {}