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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
1e6f12c0
Commit
1e6f12c0
authored
Sep 09, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056
parents
14959270
c34922c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
5 deletions
+16
-5
sql/sp_head.cc
sql/sp_head.cc
+16
-5
No files found.
sql/sp_head.cc
View file @
1e6f12c0
...
...
@@ -942,11 +942,12 @@ int sp_head::execute(THD *thd)
*/
thd
->
stmt_arena
=
i
;
/* will binlog this separately */
if
(
thd
->
prelocked_mode
==
NON_PRELOCKED
)
//TODO: change to event union?
{
/*
Will write this SP statement into binlog separately
(TODO: consider changing the condition to "not inside event union")
*/
if
(
thd
->
prelocked_mode
==
NON_PRELOCKED
)
thd
->
user_var_events_alloc
=
thd
->
mem_root
;
}
ret
=
i
->
execute
(
thd
,
&
ip
);
...
...
@@ -959,10 +960,20 @@ int sp_head::execute(THD *thd)
if
(
i
->
free_list
)
cleanup_items
(
i
->
free_list
);
i
->
state
=
Query_arena
::
EXECUTED
;
/*
If we've set thd->user_var_events_alloc to mem_root of this SP
statement, clean all the events allocated in it.
*/
if
(
thd
->
prelocked_mode
==
NON_PRELOCKED
)
{
reset_dynamic
(
&
thd
->
user_var_events
);
thd
->
user_var_events_alloc
=
NULL
;
//DEBUG
}
/* we should cleanup free_list and memroot, used by instruction */
thd
->
free_items
();
free_root
(
&
execute_mem_root
,
MYF
(
0
));
free_root
(
&
execute_mem_root
,
MYF
(
0
));
/*
Check if an exception has occurred and a handler has been found
...
...
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