1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- 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.
This commit is contained in:
Sergey Petrunya 2011-02-24 23:32:00 +03:00
parent 6c610ed979
commit 22e1ee5f5f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/xtradb/handler/ha_innodb.cc
View File

@ -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() 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; ha_innobase *h= (ha_innobase*)arg;
if (h->is_thd_killed()) if (h->is_thd_killed())
return XTRADB_ICP_ERROR; return XTRADB_ICP_ABORTED_BY_USER;
if (h->end_range) if (h->end_range)
{ {