summaryrefslogtreecommitdiff
path: root/sql/sp_head.cc
diff options
context:
space:
mode:
authorMarc Alff <marc.alff@sun.com>2008-07-14 19:43:12 -0600
committerMarc Alff <marc.alff@sun.com>2008-07-14 19:43:12 -0600
commit0add54eccf64843723fb88755fa78fed4fb55886 (patch)
tree302ecb26a02762cc90a264a5d6a12c76a15939fd /sql/sp_head.cc
parentbee8dcdfee5049fe134427bcee2da6642972e7ec (diff)
parent6783422136e93d9c198f8d80a924596993b89c91 (diff)
downloadmariadb-git-0add54eccf64843723fb88755fa78fed4fb55886.tar.gz
Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam
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 c450c9dd25d..92dcafa7aa8 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -627,14 +627,14 @@ void
sp_head::set_body_start(THD *thd, const char *begin_ptr)
{
m_body_begin= begin_ptr;
- thd->m_lip->body_utf8_start(thd, begin_ptr);
+ thd->m_parser_state->m_lip.body_utf8_start(thd, begin_ptr);
}
void
sp_head::set_stmt_end(THD *thd)
{
- Lex_input_stream *lip= thd->m_lip; /* shortcut */
+ Lex_input_stream *lip= & thd->m_parser_state->m_lip; /* shortcut */
const char *end_ptr= lip->get_cpp_ptr(); /* shortcut */
/* Make the string of parameters. */