database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam

Browse Source
This commit is contained in:
Marc Alff
2008-07-14 19:43:12 -06:00
parent bbecb19608 504f7e2d0f
commit 566e3389c2
16 changed files with 863 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_trigger.cc
View File

@ -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);