diff options
| author | unknown <pem@mysql.com> | 2005-12-02 15:04:50 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-12-02 15:04:50 +0100 |
| commit | 110b887c4e6bbe27577c1ade5dfbc9479957bf20 (patch) | |
| tree | df11e0fd1fcfdb791220357e68a8ed1a993af8c2 /sql/sp_pcontext.cc | |
| parent | 858eef452fd1c32bbbf672720043ddcedf6095ce (diff) | |
| parent | a9086bc75cbd676eb065ca660edab222df0b097e (diff) | |
| download | mariadb-git-110b887c4e6bbe27577c1ade5dfbc9479957bf20.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/usr/home/pem/bug14376/mysql-5.0
sql/sp_pcontext.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/sp.result:
SCCS merged
mysql-test/t/sp.test:
SCCS merged
sql/sp_pcontext.h:
SCCS merged
Diffstat (limited to 'sql/sp_pcontext.cc')
| -rw-r--r-- | sql/sp_pcontext.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_pcontext.cc b/sql/sp_pcontext.cc index 147173ab4d8..6f3a9cb04aa 100644 --- a/sql/sp_pcontext.cc +++ b/sql/sp_pcontext.cc @@ -52,7 +52,7 @@ sp_cond_check(LEX_STRING *sqlstate) sp_pcontext::sp_pcontext(sp_pcontext *prev) : Sql_alloc(), m_psubsize(0), m_csubsize(0), m_hsubsize(0), - m_handlers(0), m_parent(prev) + m_handlers(0), m_parent(prev), m_pboundary(0) { VOID(my_init_dynamic_array(&m_pvar, sizeof(sp_pvar_t *), 16, 8)); VOID(my_init_dynamic_array(&m_cond, sizeof(sp_cond_type_t *), 16, 8)); @@ -150,7 +150,7 @@ sp_pcontext::diff_cursors(sp_pcontext *ctx) sp_pvar_t * sp_pcontext::find_pvar(LEX_STRING *name, my_bool scoped) { - uint i= m_pvar.elements; + uint i= m_pvar.elements - m_pboundary; while (i--) { |