Commit db3e45e6 authored by unknown's avatar unknown
Browse files

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/sql_lex.cc:
  Auto merged
parents 676b59cf 4d6e16f2

sql/sql_lex.cc

+1 −1
Original line number Diff line number Diff line
@@ -1690,7 +1690,7 @@ void st_lex::cleanup_lex_after_parse_error(THD *thd) 
    Sic: we must nullify the member of the main lex, not the

    current one that will be thrown away

  */

  if (thd->lex->sphead);

  if (thd->lex->sphead)

  {

    delete thd->lex->sphead;

    thd->lex->sphead= NULL;