summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
diff options
context:
space:
mode:
authorunknown <timour@mysql.com>2005-08-19 16:05:58 +0300
committerunknown <timour@mysql.com>2005-08-19 16:05:58 +0300
commite39656fb3b526faf10940339f0cc17452724f524 (patch)
treeb0a218e41983ec6c1cdb0bbbc12437a5f46e839b /sql/sp_head.cc
parentf887aec2f38ba13cf7ec82ac5943aab0ce57d333 (diff)
parent276bd123b7b9cf516c8ddd7a28952f6e1275aa8c (diff)
downloadmariadb-git-e39656fb3b526faf10940339f0cc17452724f524.tar.gz
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
into mysql.com:/home/timka/mysql/src/5.0-2486
Diffstat (limited to 'sql/sp_head.cc')
-rw-r--r--sql/sp_head.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 26d76804fca..f119ef1ec22 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -1986,7 +1986,7 @@ sp_instr_hpush_jump::execute(THD *thd, uint *nextp)
sp_cond_type_t *p;
while ((p= li++))
- thd->spcont->push_handler(p, m_handler, m_type, m_frame);
+ thd->spcont->push_handler(p, m_ip+1, m_type, m_frame);
*nextp= m_dest;
DBUG_RETURN(0);
@@ -2003,7 +2003,7 @@ sp_instr_hpush_jump::print(String *str)
str->append(" f=");
str->qs_append(m_frame);
str->append(" h=");
- str->qs_append(m_handler);
+ str->qs_append(m_ip+1);
}
uint