1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Manual merge from the bugfix tree.

conflicts:
   conflict      sql/sql_parse.cc
This commit is contained in:
Alexey Kopytov
2010-06-11 14:51:21 +04:00
16 changed files with 186 additions and 65 deletions

View File

@@ -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,