diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2020-01-19 21:16:15 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2020-01-19 21:16:15 +0300 |
| commit | 9be5c19c3458963ccf82450b198567976275d599 (patch) | |
| tree | 13100825f3c1701cd67955e6d5d1a6a3a28f8f0b /sql/sp_head.cc | |
| parent | 6373ec3ec74515574f8a08535ed0d090b13d9122 (diff) | |
| download | mariadb-git-9be5c19c3458963ccf82450b198567976275d599.tar.gz | |
Fix another trivial merge error
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files 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; |