Commit 69d0960d authored by monty@mysql.com's avatar monty@mysql.com

Fixed wrong merge

parent 3ecf4de2
...@@ -1197,7 +1197,6 @@ ok2: ...@@ -1197,7 +1197,6 @@ 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