diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-17 16:33:40 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-17 16:33:40 +0200 |
| commit | 4ef2e43080989cfb5ce62f5816505d17759c3f7c (patch) | |
| tree | 0d43fde597c04f7cf253a60eb96206755e068adc /sql/sp_head.cc | |
| parent | 8f102b584d4e8f02da924f9be094014136eb453f (diff) | |
| parent | c6cd64f3cb4202fdadeb470fe28f6c50e337f460 (diff) | |
| download | mariadb-git-4ef2e43080989cfb5ce62f5816505d17759c3f7c.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 07e760f4438..e86a35f4b27 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1133,7 +1133,7 @@ sp_head::execute(THD *thd, bool merge_da_on_success) We should also save Item tree change list to avoid rollback something too early in the calling query. */ - thd->change_list.move_elements_to(&old_change_list); + thd->Item_change_list::move_elements_to(&old_change_list); /* Cursors will use thd->packet, so they may corrupt data which was prepared for sending by upper level. OTOH cursors in the same routine can share this @@ -1279,8 +1279,8 @@ sp_head::execute(THD *thd, bool merge_da_on_success) thd->spcont->instr_ptr= ip; thd->server_status= (thd->server_status & ~status_backup_mask) | old_server_status; old_packet.swap(thd->packet); - DBUG_ASSERT(thd->change_list.is_empty()); - old_change_list.move_elements_to(&thd->change_list); + DBUG_ASSERT(thd->Item_change_list::is_empty()); + old_change_list.move_elements_to(thd); thd->lex= old_lex; thd->set_query_id(old_query_id); DBUG_ASSERT(!thd->derived_tables); @@ -3071,7 +3071,7 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp, bool parent_modified_non_trans_table= thd->transaction.stmt.modified_non_trans_table; thd->transaction.stmt.modified_non_trans_table= FALSE; DBUG_ASSERT(!thd->derived_tables); - DBUG_ASSERT(thd->change_list.is_empty()); + DBUG_ASSERT(thd->Item_change_list::is_empty()); /* Use our own lex. We should not save old value since it is saved/restored in |