Commit 6c24dd7f authored by unknown's avatar unknown

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.
parent 1e9bdcfb
...@@ -1961,7 +1961,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd) ...@@ -1961,7 +1961,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
my_ptrdiff_t adjust_ptrs; my_ptrdiff_t adjust_ptrs;
Field **field,**org_field, *found_next_number_field; Field **field,**org_field, *found_next_number_field;
TABLE *copy; TABLE *copy;
TABLE_SHARE *share= table->s; TABLE_SHARE *share;
uchar *bitmap; uchar *bitmap;
DBUG_ENTER("Delayed_insert::get_local_table"); DBUG_ENTER("Delayed_insert::get_local_table");
...@@ -1985,6 +1985,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd) ...@@ -1985,6 +1985,7 @@ TABLE *Delayed_insert::get_local_table(THD* client_thd)
goto error; goto error;
} }
} }
share= table->s;
/* /*
Allocate memory for the TABLE object, the field pointers array, and Allocate memory for the TABLE object, the field pointers array, and
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment