Commit e71ad86c authored by monty@mysql.com's avatar monty@mysql.com

Merge monty@192.168.0.9:/my/mysql-5.0

into  mysql.com:/home/my/mysql-5.0
parents 770f03ef 3f2e2664
...@@ -1195,6 +1195,7 @@ ok2: ...@@ -1195,6 +1195,7 @@ ok2:
end: end:
if (arena) if (arena)
thd->restore_active_arena(arena, &backup); thd->restore_active_arena(arena, &backup);
lex_end(thd->lex);
thd->lex= old_lex; thd->lex= old_lex;
DBUG_RETURN(result); DBUG_RETURN(result);
......
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