diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-31 14:59:52 +0300 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-31 14:59:52 +0300 |
| commit | 1f6088cc8b0fe2c3846699063816b6b664a85ed2 (patch) | |
| tree | 108cd1ee75ce59975e54d5b5a73480b06cd38b89 /sql/sp_head.cc | |
| parent | 8e1ec7ab5e819aa3d42ba2f2b381c44253dc9021 (diff) | |
| parent | 23fec91b6575e6fc4a86666ce8599653d5f30810 (diff) | |
| download | mariadb-git-1f6088cc8b0fe2c3846699063816b6b664a85ed2.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B27417-5.1-opt
sql/sp_head.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index a5ad5043985..7b2073b8de3 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -927,7 +927,7 @@ subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str) /* append the text between sp ref occurences */ res|= qbuf.append(cur + prev_pos, (*splocal)->pos_in_query - prev_pos); - prev_pos= (*splocal)->pos_in_query + (*splocal)->m_name.length; + prev_pos= (*splocal)->pos_in_query + (*splocal)->len_in_query; /* append the spvar substitute */ res|= qbuf.append(STRING_WITH_LEN(" NAME_CONST('")); |