diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 14:55:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-01 14:55:46 +0200 |
| commit | 81ab9ea63f5d3ad4909bb75552008d6b035a371b (patch) | |
| tree | 6e65113d85d36c9f488da15540ddd601e7641fee /sql/sql_insert.cc | |
| parent | c537576495e1e651bf3dc63e5a569fcddd9fbec8 (diff) | |
| parent | e6b3e38d62d13206ae982fc7b740d5d8024b207a (diff) | |
| download | mariadb-git-81ab9ea63f5d3ad4909bb75552008d6b035a371b.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 34c4211070b..b203fffaa72 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3050,7 +3050,7 @@ pthread_handler_t handle_delayed_insert(void *arg) if (thd->mdl_context.clone_ticket(&di->grl_protection) || thd->mdl_context.clone_ticket(&di->table_list.mdl_request)) { - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); di->handler_thread_initialized= TRUE; goto err; } @@ -3246,7 +3246,7 @@ pthread_handler_t handle_delayed_insert(void *arg) thd->set_killed(KILL_CONNECTION_HARD); // If error close_thread_tables(thd); // Free the table - thd->mdl_context.release_transactional_locks(); + thd->release_transactional_locks(); mysql_cond_broadcast(&di->cond_client); // Safety mysql_mutex_lock(&LOCK_delayed_create); // Because of delayed_get_table @@ -4722,7 +4722,8 @@ bool select_create::send_eof() WSREP_ERROR("Appending table key for CTAS failed: %s, %d", (wsrep_thd_query(thd)) ? wsrep_thd_query(thd) : "void", rcode); - return true; + abort_result_set(); + DBUG_RETURN(true); } /* If commit fails, we should be able to reset the OK status. */ thd->get_stmt_da()->set_overwrite_status(TRUE); |