diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 14:51:21 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 14:51:21 +0400 |
| commit | e5cf56ef80391caca2f06b34fc1de1313196e91f (patch) | |
| tree | 0a5326c23c1d2ab3752bcf621639494ca7c16fc1 /sql/sql_trigger.cc | |
| parent | 0823afc8bf160e03ce722c5e3cef21024b63b99a (diff) | |
| parent | c2ebb0ac882feadedd0bbca71277fd2de66aa957 (diff) | |
| download | mariadb-git-e5cf56ef80391caca2f06b34fc1de1313196e91f.tar.gz | |
Manual merge from the bugfix tree.
conflicts:
conflict sql/sql_parse.cc
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 1bd3fc78400..bf4a46a4c67 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1297,9 +1297,9 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, thd->variables.sql_mode= (ulong)*trg_sql_mode; - Parser_state parser_state(thd, - trg_create_str->str, - trg_create_str->length); + Parser_state parser_state; + if (parser_state.init(thd, trg_create_str->str, trg_create_str->length)) + goto err_with_lex_cleanup; Trigger_creation_ctx *creation_ctx= Trigger_creation_ctx::create(thd, |