Merge monty@192.168.0.9:/my/mysql-5.0
into mysql.com:/home/my/mysql-5.0
This commit is contained in:
commit
e71ad86cc1
@ -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);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user