Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
9be5c19c
Commit
9be5c19c
authored
Jan 19, 2020
by
Sergei Petrunia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix another trivial merge error
parent
6373ec3e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
sql/sp_head.cc
sql/sp_head.cc
+2
-2
No files found.
sql/sp_head.cc
View file @
9be5c19c
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment