Commit 4b879f22 authored by kostja@bodhi.local's avatar kostja@bodhi.local

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

into  bodhi.local:/opt/local/work/mysql-5.1-runtime
parents ae978961 b89b1922
...@@ -1690,7 +1690,7 @@ void st_lex::cleanup_lex_after_parse_error(THD *thd) ...@@ -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 Sic: we must nullify the member of the main lex, not the
current one that will be thrown away current one that will be thrown away
*/ */
if (thd->lex->sphead); if (thd->lex->sphead)
{ {
delete thd->lex->sphead; delete thd->lex->sphead;
thd->lex->sphead= NULL; thd->lex->sphead= NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment