diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
| commit | db260b19e3edb9e153abf784711a3ae13e40db4a (patch) | |
| tree | 4a9d9e50072d36ee917a570f8bf83a0117e971db /sql/event_data_objects.cc | |
| parent | 0df8279c468235f4feaf9eb25aa2beb5032ee1dc (diff) | |
| parent | 4a458290441937661136c73afa61393a6634f7b0 (diff) | |
| download | mariadb-git-db260b19e3edb9e153abf784711a3ae13e40db4a.tar.gz | |
Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
Also merge charset patch.
Diffstat (limited to 'sql/event_data_objects.cc')
| -rw-r--r-- | sql/event_data_objects.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc index 331b437b7ff..92427c0ba41 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -1432,7 +1432,7 @@ 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(thd, thd->query(), thd->query_length()); lex_start(thd); if (parse_sql(thd, & parser_state, creation_ctx)) |