Commit 22e1ee5f authored by Sergey Petrunya's avatar Sergey Petrunya

BUG#724537: innodb_mysql.test fails with --embedded-server

- Don't access THD::killed directly from ha_innodb.cc. This is forbidden because 
  THD has different membership (and so, different member offsets) in regular and embedded server.
  Access must be done through thd_killed() function.

- if we're interrupted by the user while in XtraDB, return the proper code.
parent 6c610ed9
......@@ -12091,7 +12091,7 @@ ha_rows ha_innobase::multi_range_read_info(uint keyno, uint n_ranges, uint keys,
bool ha_innobase::is_thd_killed()
{
return test(user_thd->killed);
return thd_killed(user_thd);
}
/**
......@@ -12109,7 +12109,7 @@ static xtradb_icp_result_t index_cond_func_innodb(void *arg)
{
ha_innobase *h= (ha_innobase*)arg;
if (h->is_thd_killed())
return XTRADB_ICP_ERROR;
return XTRADB_ICP_ABORTED_BY_USER;
if (h->end_range)
{
......
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