diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 16:52:06 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 16:52:06 +0400 |
| commit | 162e426238ed49e175238b1a06072258c2fc666f (patch) | |
| tree | dd79682febb582afa1309c3b04f172d140b20aa6 /sql/sql_trigger.cc | |
| parent | 5bace3f049de457ddbeb3a1946089c0f4c479229 (diff) | |
| parent | 779e2a968632a5e73c660307892ca6a868399dfc (diff) | |
| download | mariadb-git-162e426238ed49e175238b1a06072258c2fc666f.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, |