diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2009-07-24 21:04:55 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2009-07-24 21:04:55 +0500 |
| commit | 2bc6b6a80099ddb5b57e3d3c8be120e6596daa08 (patch) | |
| tree | 999d090b1f7c4cb9c23b5e41592e0cec56389c5f /sql/sp_head.cc | |
| parent | c24cccabdda8fad2117e3dea39e4de3c7feb3157 (diff) | |
| parent | dc0a87fdc24ed0859856d243ad68a0c1913db3af (diff) | |
| download | mariadb-git-2bc6b6a80099ddb5b57e3d3c8be120e6596daa08.tar.gz | |
Merge from 5.0
******
manual merge 5.0-bugteam --> 5.1-bugteam (bug 38816)
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 8a8a5b06cc1..018937fec2f 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1012,8 +1012,7 @@ subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str) else DBUG_RETURN(TRUE); - thd->query= pbuf; - thd->query_length= qbuf.length(); + thd->set_query(pbuf, qbuf.length()); DBUG_RETURN(FALSE); } @@ -2858,8 +2857,7 @@ sp_instr_stmt::execute(THD *thd, uint *nextp) } else *nextp= m_ip+1; - thd->query= query; - thd->query_length= query_length; + thd->set_query(query, query_length); thd->query_name_consts= 0; if (!thd->is_error()) |