diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 17:48:24 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 17:48:24 +0400 |
| commit | f84b3f5c21c62ebe3b489250a09aca0ffde1313c (patch) | |
| tree | bad36a3866fc1f57ed09d6de5a590fa2e12bacfe /sql/event_data_objects.cc | |
| parent | 26a034959299cb72d04d92ab330dfb83ef6082a6 (diff) | |
| parent | e5cf56ef80391caca2f06b34fc1de1313196e91f (diff) | |
| download | mariadb-git-f84b3f5c21c62ebe3b489250a09aca0ffde1313c.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
conflicts:
conflict mysys/safemalloc.c
conflict sql/mysqld.cc
conflict sql/sp.cc
conflict sql/sql_lex.cc
conflict sql/sql_lex.h
conflict sql/sql_parse.cc
conflict sql/sql_prepare.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 28fd1e240a2..c778d72a016 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -1447,7 +1447,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)) |