summaryrefslogtreecommitdiff
path: root/sql/event_data_objects.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
commit566e3389c2b91ce03a04f574fda562c02b7d0692 (patch)
tree302ecb26a02762cc90a264a5d6a12c76a15939fd /sql/event_data_objects.cc
parentbbecb196087ee236885fcd4bfc99389d3edf853a (diff)
parent504f7e2d0f742985e72ee2ebffe704093f8e602d (diff)
downloadmariadb-git-566e3389c2b91ce03a04f574fda562c02b7d0692.tar.gz
Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam
Diffstat (limited to 'sql/event_data_objects.cc')
-rw-r--r--sql/event_data_objects.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index dd47b8dd916..ea3c9f17e23 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -1439,10 +1439,10 @@ Event_job_data::execute(THD *thd, bool drop)
thd->query_length= sp_sql.length();
{
- Lex_input_stream lip(thd, thd->query, thd->query_length);
+ Parser_state parser_state(thd, thd->query, thd->query_length);
lex_start(thd);
- if (parse_sql(thd, &lip, creation_ctx))
+ if (parse_sql(thd, & parser_state, creation_ctx))
{
sql_print_error("Event Scheduler: "
"%serror during compilation of %s.%s",