diff options
| author | unknown <timour@mysql.com> | 2005-08-19 16:05:58 +0300 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2005-08-19 16:05:58 +0300 |
| commit | e39656fb3b526faf10940339f0cc17452724f524 (patch) | |
| tree | b0a218e41983ec6c1cdb0bbbc12437a5f46e839b /sql | |
| parent | f887aec2f38ba13cf7ec82ac5943aab0ce57d333 (diff) | |
| parent | 276bd123b7b9cf516c8ddd7a28952f6e1275aa8c (diff) | |
| download | mariadb-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')
| -rw-r--r-- | sql/sp_head.cc | 4 | ||||
| -rw-r--r-- | sql/sp_head.h | 2 |
2 files changed, 2 insertions, 4 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 diff --git a/sql/sp_head.h b/sql/sp_head.h index e15b68be158..8ae7834eb2a 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -714,7 +714,6 @@ public: sp_instr_hpush_jump(uint ip, sp_pcontext *ctx, int htype, uint fp) : sp_instr_jump(ip, ctx), m_type(htype), m_frame(fp) { - m_handler= ip+1; m_cond.empty(); } @@ -743,7 +742,6 @@ private: int m_type; // Handler type uint m_frame; - uint m_handler; // Location of handler List<struct sp_cond_type> m_cond; }; // class sp_instr_hpush_jump : public sp_instr_jump |