diff options
| author | Marc Alff <marc.alff@sun.com> | 2008-07-14 19:43:12 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2008-07-14 19:43:12 -0600 |
| commit | f34c99b4d8b60e6ae5cddde206ef4da30811e5fe (patch) | |
| tree | 302ecb26a02762cc90a264a5d6a12c76a15939fd /sql/sql_trigger.cc | |
| parent | a3619d2e865eb5705a8acfc10db91ae700bb7043 (diff) | |
| parent | 5f9f35e291eba2e6b8fbdc7e763c14c370c676ec (diff) | |
| download | mariadb-git-f34c99b4d8b60e6ae5cddde206ef4da30811e5fe.tar.gz | |
Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index d426904e4b2..32389bde44c 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1287,7 +1287,9 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, thd->variables.sql_mode= (ulong)*trg_sql_mode; - Lex_input_stream lip(thd, trg_create_str->str, trg_create_str->length); + Parser_state parser_state(thd, + trg_create_str->str, + trg_create_str->length); Trigger_creation_ctx *creation_ctx= Trigger_creation_ctx::create(thd, @@ -1300,7 +1302,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, lex_start(thd); thd->spcont= NULL; - if (parse_sql(thd, &lip, creation_ctx)) + if (parse_sql(thd, & parser_state, creation_ctx)) { /* Currently sphead is always deleted in case of a parse error */ DBUG_ASSERT(lex.sphead == 0); |