summaryrefslogtreecommitdiff
path: root/sql/event_data_objects.cc
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-05 23:28:35 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-05 23:28:35 +0300
commitcd14c47c99ddcc52d7b72832c4d8dad8852e0985 (patch)
treebf91e085339760c6e972b1091e9a0c12545e1bc2 /sql/event_data_objects.cc
parent16b603a8b0c2bba16cb66b1769f21c0185435d33 (diff)
parentb30c1886dc52153009c2ea67878a9763448f461e (diff)
downloadmariadb-git-cd14c47c99ddcc52d7b72832c4d8dad8852e0985.tar.gz
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/event_data_objects.cc')
-rw-r--r--sql/event_data_objects.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index 271ac73bd30..23eec749a30 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -1435,7 +1435,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))