summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sp_head.cc')
-rw-r--r--sql/sp_head.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index aec8983f76f..ffcedaea315 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -3146,7 +3146,7 @@ bool sp_head::replace_instr_to_nop(THD *thd, uint ip)
void sp_head::optimize()
{
- List<sp_instr> bp;
+ List<sp_instr_opt_meta> bp;
sp_instr *i;
uint src, dst;
@@ -3168,14 +3168,13 @@ void sp_head::optimize()
if (src != dst)
{
/* Move the instruction and update prev. jumps */
- sp_instr *ibp;
- List_iterator_fast<sp_instr> li(bp);
+ sp_instr_opt_meta *ibp;
+ List_iterator_fast<sp_instr_opt_meta> li(bp);
set_dynamic(&m_instr, (uchar*)&i, dst);
while ((ibp= li++))
{
- sp_instr_opt_meta *im= static_cast<sp_instr_opt_meta *>(ibp);
- im->set_destination(src, dst);
+ ibp->set_destination(src, dst);
}
}
i->opt_move(dst, &bp);