diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-20 02:07:21 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-20 20:25:35 +0200 |
| commit | ff1d10ef9c8595136cc7687aa59e638cf31db332 (patch) | |
| tree | 1aeb1d16ce75cb40a56d34789f0b2c083e4aa8f6 /sql/sql_trigger.cc | |
| parent | 6f530c63cd90a86e3acb5e5e6bf81c6d666025eb (diff) | |
| parent | 91dfb6141f45aed5cf3fe585d8c5db86f9ddbfe9 (diff) | |
| download | mariadb-git-ff1d10ef9c8595136cc7687aa59e638cf31db332.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 0fefe7d2c52..8f76e7a537e 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -1358,12 +1358,12 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, List_iterator_fast<LEX_STRING> it_connection_cl_name(trigger_list->connection_cl_names); List_iterator_fast<LEX_STRING> it_db_cl_name(trigger_list->db_cl_names); List_iterator_fast<ulonglong> it_create_times(trigger_list->create_times); - LEX *old_lex= thd->lex, *old_stmt_lex= thd->stmt_lex; + LEX *old_lex= thd->lex; LEX lex; sp_rcontext *save_spcont= thd->spcont; sql_mode_t save_sql_mode= thd->variables.sql_mode; - thd->lex= thd->stmt_lex= &lex; + thd->lex= &lex; save_db.str= thd->db; save_db.length= thd->db_length; @@ -1581,7 +1581,6 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, } thd->reset_db(save_db.str, save_db.length); thd->lex= old_lex; - thd->stmt_lex= old_stmt_lex; thd->spcont= save_spcont; thd->variables.sql_mode= save_sql_mode; @@ -1595,7 +1594,6 @@ bool Table_triggers_list::check_n_load(THD *thd, const char *db, err_with_lex_cleanup: lex_end(&lex); thd->lex= old_lex; - thd->stmt_lex= old_stmt_lex; thd->spcont= save_spcont; thd->variables.sql_mode= save_sql_mode; thd->reset_db(save_db.str, save_db.length); |