1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix another trivial merge error

Browse Source
This commit is contained in:
Sergei Petrunia 2020-01-19 21:16:15 +03:00
parent 6373ec3ec7
commit 9be5c19c34
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sp_head.cc
View File

@ -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;