mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Fixed wrong merge
This commit is contained in:
parent
e44823ff7f
commit
d1b6779ade
1 changed files with 0 additions and 1 deletions
|
@ -1197,7 +1197,6 @@ ok2:
|
|||
end:
|
||||
if (arena)
|
||||
thd->restore_active_arena(arena, &backup);
|
||||
lex_end(thd->lex);
|
||||
thd->lex= old_lex;
|
||||
DBUG_RETURN(result);
|
||||
|
||||
|
|
Loading…
Reference in a new issue