diff options
| author | Marc Alff <marc.alff@sun.com> | 2008-07-14 19:43:12 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2008-07-14 19:43:12 -0600 |
| commit | f34c99b4d8b60e6ae5cddde206ef4da30811e5fe (patch) | |
| tree | 302ecb26a02762cc90a264a5d6a12c76a15939fd /sql/sp_head.cc | |
| parent | a3619d2e865eb5705a8acfc10db91ae700bb7043 (diff) | |
| parent | 5f9f35e291eba2e6b8fbdc7e763c14c370c676ec (diff) | |
| download | mariadb-git-f34c99b4d8b60e6ae5cddde206ef4da30811e5fe.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.cc | 4 |
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. */ |