Commit 9be5c19c authored by Sergei Petrunia's avatar Sergei Petrunia

Fix another trivial merge error

parent 6373ec3e
...@@ -493,8 +493,8 @@ void sp_head::destroy(sp_head *sp) ...@@ -493,8 +493,8 @@ void sp_head::destroy(sp_head *sp)
{ {
/* Make a copy of main_mem_root as free_root will free the sp */ /* Make a copy of main_mem_root as free_root will free the sp */
MEM_ROOT own_root= sp->main_mem_root; MEM_ROOT own_root= sp->main_mem_root;
DBUG_PRINT("info", ("mem_root 0x%lx moved to 0x%lx", DBUG_PRINT("info", ("mem_root %p moved to %p",
(ulong) &sp->mem_root, (ulong) &own_root)); &sp->mem_root, &own_root));
delete sp; delete sp;
......
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