Fixed a valgrind warning when creating stored procedures containing complex

unions (crashed randomly), and made "label" not a reserved word.


sql/sql_parse.cc:
  Fixed valgrind warning for certain complex unions (which sometime caused crash).
sql/sql_yacc.yy:
  The temporary(?) "label" statement should not be a reserved word.
This commit is contained in:
unknown 2004-08-24 12:59:06 +02:00
commit 5a10f1ac96
2 changed files with 5 additions and 0 deletions

View file

@ -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;