From 6c24dd7f0cdc3d996610c4cfc8181d25c5f580fe Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 19 Jul 2007 21:10:19 +0400 Subject: [PATCH] A follow-up fix for Bug#29431 "killing an insert delayed thread causes crash" in 5.1 sql/sql_insert.cc: Additional safety fix: do not assume we already have a share in get_local_table. --- sql/sql_insert.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 903300c0402..b362835412a 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1961,7 +1961,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd) my_ptrdiff_t adjust_ptrs; Field **field,**org_field, *found_next_number_field; TABLE *copy; - TABLE_SHARE *share= table->s; + TABLE_SHARE *share; uchar *bitmap; DBUG_ENTER("Delayed_insert::get_local_table"); @@ -1985,6 +1985,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd) goto error; } } + share= table->s; /* Allocate memory for the TABLE object, the field pointers array, and