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/sp_head.cc | |
| parent | 6f530c63cd90a86e3acb5e5e6bf81c6d666025eb (diff) | |
| parent | 91dfb6141f45aed5cf3fe585d8c5db86f9ddbfe9 (diff) | |
| download | mariadb-git-ff1d10ef9c8595136cc7687aa59e638cf31db332.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 081d8cb9c23..a832aa91004 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -822,7 +822,7 @@ sp_head::~sp_head() thd->lex->sphead= NULL; lex_end(thd->lex); delete thd->lex; - thd->lex= thd->stmt_lex= lex; + thd->lex= lex; } my_hash_free(&m_sptabs); @@ -1129,7 +1129,7 @@ sp_head::execute(THD *thd, bool merge_da_on_success) backup_arena; query_id_t old_query_id; TABLE *old_derived_tables; - LEX *old_lex, *old_stmt_lex; + LEX *old_lex; Item_change_list old_change_list; String old_packet; uint old_server_status; @@ -1233,7 +1233,6 @@ sp_head::execute(THD *thd, bool merge_da_on_success) do it in each instruction */ old_lex= thd->lex; - old_stmt_lex= thd->stmt_lex; /* We should also save Item tree change list to avoid rollback something too early in the calling query. @@ -1383,7 +1382,6 @@ sp_head::execute(THD *thd, bool merge_da_on_success) DBUG_ASSERT(thd->Item_change_list::is_empty()); old_change_list.move_elements_to(thd); thd->lex= old_lex; - thd->stmt_lex= old_stmt_lex; thd->set_query_id(old_query_id); DBUG_ASSERT(!thd->derived_tables); thd->derived_tables= old_derived_tables; @@ -2220,7 +2218,7 @@ sp_head::reset_lex(THD *thd) if (sublex == 0) DBUG_RETURN(TRUE); - thd->lex= thd->stmt_lex= sublex; + thd->lex= sublex; (void)m_lex.push_front(oldlex); /* Reset most stuff. */ @@ -2964,7 +2962,7 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp, We should not save old value since it is saved/restored in sp_head::execute() when we are entering/leaving routine. */ - thd->lex= thd->stmt_lex= m_lex; + thd->lex= m_lex; thd->set_query_id(next_query_id()); |