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 | 566e3389c2b91ce03a04f574fda562c02b7d0692 (patch) | |
| tree | 302ecb26a02762cc90a264a5d6a12c76a15939fd /sql/sp.cc | |
| parent | bbecb196087ee236885fcd4bfc99389d3edf853a (diff) | |
| parent | 504f7e2d0f742985e72ee2ebffe704093f8e602d (diff) | |
| download | mariadb-git-566e3389c2b91ce03a04f574fda562c02b7d0692.tar.gz | |
Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index a1e5e1291ae..cc545992857 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -617,12 +617,12 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp, thd->spcont= NULL; { - Lex_input_stream lip(thd, defstr.c_ptr(), defstr.length()); + Parser_state parser_state(thd, defstr.c_ptr(), defstr.length()); lex_start(thd); thd->push_internal_handler(&warning_handler); - ret= parse_sql(thd, &lip, creation_ctx) || newlex.sphead == NULL; + ret= parse_sql(thd, & parser_state, creation_ctx) || newlex.sphead == NULL; thd->pop_internal_handler(); /* |