revision-id: 9be5c19c3458963ccf82450b198567976275d599 (mariadb-10.3.21-25-g9be5c19c345) parent(s): 6373ec3ec74515574f8a08535ed0d090b13d9122 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2020-01-19 21:16:15 +0300 message: Fix another trivial merge error --- sql/sp_head.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 3a113de9dd5..ba130881d68 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -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 */ MEM_ROOT own_root= sp->main_mem_root; - DBUG_PRINT("info", ("mem_root 0x%lx moved to 0x%lx", - (ulong) &sp->mem_root, (ulong) &own_root)); + DBUG_PRINT("info", ("mem_root %p moved to %p", + &sp->mem_root, &own_root)); delete sp;