mirror of
https://github.com/MariaDB/server.git
synced 2026-04-29 11:45:32 +02:00
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
This commit is contained in:
commit
7d2442a160
16 changed files with 180 additions and 26 deletions
|
|
@ -816,6 +816,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
|
|||
List_iterator_fast<LEX_STRING> it_definer(triggers->
|
||||
definers_list);
|
||||
LEX *old_lex= thd->lex, lex;
|
||||
sp_rcontext *save_spcont= thd->spcont;
|
||||
ulong save_sql_mode= thd->variables.sql_mode;
|
||||
|
||||
thd->lex= &lex;
|
||||
|
|
@ -831,6 +832,7 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db,
|
|||
thd->variables.sql_mode= (ulong)*trg_sql_mode;
|
||||
lex_start(thd, (uchar*)trg_create_str->str, trg_create_str->length);
|
||||
|
||||
thd->spcont= 0;
|
||||
if (yyparse((void *)thd) || thd->is_fatal_error)
|
||||
{
|
||||
/*
|
||||
|
|
@ -919,6 +921,7 @@ err_with_lex_cleanup:
|
|||
// QQ: anything else ?
|
||||
lex_end(&lex);
|
||||
thd->lex= old_lex;
|
||||
thd->spcont= save_spcont;
|
||||
thd->variables.sql_mode= save_sql_mode;
|
||||
thd->db= save_db.str;
|
||||
thd->db_length= save_db.length;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue