diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 22:05:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-06 22:05:32 +0300 |
| commit | c7a2fb1e086f9eaf03fe437326ecf32329b22e37 (patch) | |
| tree | b2c78e5f3ece211a308ee65779d400e655a8b469 /sql/sp_head.cc | |
| parent | 9d479e2577aa0d8df3f26cb7a779c9478e423583 (diff) | |
| parent | 4612cb88fa8b391812db44327040a5878e5dbc44 (diff) | |
| download | mariadb-git-c7a2fb1e086f9eaf03fe437326ecf32329b22e37.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 6ad32ba91a0..e91364b0c0a 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1152,6 +1152,7 @@ sp_head::execute(THD *thd, bool merge_da_on_success) backup_arena; query_id_t old_query_id; TABLE *old_derived_tables; + TABLE *old_rec_tables; LEX *old_lex; Item_change_list old_change_list; String old_packet; @@ -1232,6 +1233,8 @@ sp_head::execute(THD *thd, bool merge_da_on_success) old_query_id= thd->query_id; old_derived_tables= thd->derived_tables; thd->derived_tables= 0; + old_rec_tables= thd->rec_tables; + thd->rec_tables= 0; save_sql_mode= thd->variables.sql_mode; thd->variables.sql_mode= m_sql_mode; save_abort_on_warning= thd->abort_on_warning; @@ -1490,6 +1493,7 @@ sp_head::execute(THD *thd, bool merge_da_on_success) thd->set_query_id(old_query_id); DBUG_ASSERT(!thd->derived_tables); thd->derived_tables= old_derived_tables; + thd->rec_tables= old_rec_tables; thd->variables.sql_mode= save_sql_mode; thd->abort_on_warning= save_abort_on_warning; thd->m_reprepare_observer= save_reprepare_observer; |