diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 16:52:06 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 16:52:06 +0400 |
| commit | 386929d3aee738cd0e3db335fb54e95bba8f9985 (patch) | |
| tree | dd79682febb582afa1309c3b04f172d140b20aa6 /sql/event_data_objects.cc | |
| parent | 0823afc8bf160e03ce722c5e3cef21024b63b99a (diff) | |
| parent | c2ebb0ac882feadedd0bbca71277fd2de66aa957 (diff) | |
| download | mariadb-git-386929d3aee738cd0e3db335fb54e95bba8f9985.tar.gz | |
Manual merge from the bugfix tree.
conflicts:
conflict sql/sql_parse.cc
Diffstat (limited to 'sql/event_data_objects.cc')
| -rw-r--r-- | sql/event_data_objects.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 0218092c4c7..6119a97dbf9 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -1434,7 +1434,10 @@ Event_job_data::execute(THD *thd, bool drop) thd->set_query(sp_sql.c_ptr_safe(), sp_sql.length()); { - Parser_state parser_state(thd, thd->query(), thd->query_length()); + Parser_state parser_state; + if (parser_state.init(thd, thd->query(), thd->query_length())) + goto end; + lex_start(thd); if (parse_sql(thd, & parser_state, creation_ctx)) |