database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-16286 Killed CREATE SEQUENCE leaves sequence in unusable state

Browse Source 
Fixed by deleting the sequence if we where not able to initialize it

I also noticed that we didn't always set the error message when
check_killed(), which could lead to aborted queries without error
beeing properly set. Fixed by default setting error message if
check_error() noticed that killed had been called.
This allowed me to remove a lot of calls to thd->send_kill_message().
This commit is contained in:
Monty
2018-05-26 16:57:18 +03:00
parent b3a2761807
commit 58721c3e38
11 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/rpl_parallel.cc
View File

@ -337,7 +337,7 @@ do_gco_wait(rpl_group_info *rgi, group_commit_orderer *gco,
thd->set_time_for_next_stage();
do
{
if (unlikely(thd->check_killed()) && !rgi->worker_error)
if (!rgi->worker_error && unlikely(thd->check_killed(1)))
{
DEBUG_SYNC(thd, "rpl_parallel_start_waiting_for_prior_killed");
thd->clear_error();
@ -404,7 +404,6 @@ do_ftwrl_wait(rpl_group_info *rgi,
break;
if (unlikely(thd->check_killed()))
{
thd->send_kill_message();
slave_output_error_info(rgi, thd);
signal_error_to_sql_driver_thread(thd, rgi, 1);
break;
@ -455,7 +454,6 @@ pool_mark_busy(rpl_parallel_thread_pool *pool, THD *thd)
{
if (thd && unlikely(thd->check_killed()))
{
thd->send_kill_message();
res= 1;
break;
}
@ -573,7 +571,6 @@ rpl_pause_for_ftwrl(THD *thd)
{
if (unlikely(thd->check_killed()))
{
thd->send_kill_message();
err= 1;
break;
}
@ -838,8 +835,8 @@ do_retry:
}
DBUG_EXECUTE_IF("inject_mdev8031", {
/* Simulate pending KILL caught in read_relay_log_description_event(). */
if (unlikely(thd->check_killed())) {
thd->send_kill_message();
if (unlikely(thd->check_killed()))
{
err= 1;
goto err;
}
@ -2077,7 +2074,7 @@ rpl_parallel_entry::choose_thread(rpl_group_info *rgi, bool *did_enter_cond,
/* The thread is ready to queue into. */
break;
}
else if (unlikely(rli->sql_driver_thd->check_killed()))
else if (unlikely(rli->sql_driver_thd->check_killed(1)))
{
unlock_or_exit_cond(rli->sql_driver_thd, &thr->LOCK_rpl_thread,
did_enter_cond, old_stage);
@ -2405,7 +2402,6 @@ rpl_parallel::wait_for_workers_idle(THD *thd)
{
if (unlikely(thd->check_killed()))
{
thd->send_kill_message();
err= 1;
break;
}