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

Fixed crash in Delayed_insert::get_local_table()

Browse Source 
This was a bug in my previous commit, found by buildbot
This commit is contained in:
Monty
2023-11-28 12:05:22 +02:00
parent 7081feeac9
commit acdb8b6779
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_insert.cc
View File

@ -2586,7 +2586,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
} }
THD_STAGE_INFO(client_thd, stage_got_handler_lock); THD_STAGE_INFO(client_thd, stage_got_handler_lock);
if (client_thd->killed) if (client_thd->killed)
goto error; goto error2;
if (thd.killed) if (thd.killed)
{ {
/* /*
@ -2611,7 +2611,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
my_message(thd.get_stmt_da()->sql_errno(), my_message(thd.get_stmt_da()->sql_errno(),
thd.get_stmt_da()->message(), MYF(0)); thd.get_stmt_da()->message(), MYF(0));
} }
goto error; goto error2;
} }
} }
share= table->s; share= table->s;
@ -2629,7 +2629,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
share->reclength + share->reclength +
share->column_bitmap_size*4); share->column_bitmap_size*4);
if (!copy_tmp) if (!copy_tmp)
goto error; goto error2;
/* Copy the TABLE object. */ /* Copy the TABLE object. */
copy= new (copy_tmp) TABLE; copy= new (copy_tmp) TABLE;
@ -2739,6 +2739,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
/* Got fatal error */ /* Got fatal error */
error: error:
free_root(&copy->mem_root, 0); free_root(&copy->mem_root, 0);
error2:
tables_in_use--; tables_in_use--;
mysql_cond_signal(&cond); // Inform thread about abort mysql_cond_signal(&cond); // Inform thread about abort
DBUG_RETURN(0); DBUG_RETURN(0);