diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-10-16 13:29:42 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-10-16 13:29:42 +0300 |
| commit | 7b4ef910f7830e85e2bc240b0803b994d6e0446b (patch) | |
| tree | 4a635fd50a6abdd9b0c814cb889d2996fc60eb3e /sql/event_data_objects.cc | |
| parent | d7cc9194e0d657fb475cf14a3463a976d336b63a (diff) | |
| download | mariadb-git-7b4ef910f7830e85e2bc240b0803b994d6e0446b.tar.gz | |
Bug #40877: multi statement execution fails in 5.1.30
Implemented the server infrastructure for the fix:
1. Added a function LEX_STRING *thd_query_string(THD) to return
a LEX_STRING structure instead of char *.
This is the function that must be called in innodb instead of
thd_query()
2. Did some encapsulation in THD : aggregated thd_query and
thd_query_length into a LEX_STRING and made accessor and mutator
methods for easy code updating.
3. Updated the server code to use the new methods where applicable.
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 dba32cac6b2..f2ec0e8cf64 100644 --- a/sql/event_data_objects.cc +++ b/sql/event_data_objects.cc @@ -1433,7 +1433,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)) |