From 22e1ee5f5f5b1fb5a571a58c63ee805deb8ea43a Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Thu, 24 Feb 2011 23:32:00 +0300 Subject: [PATCH] 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. --- storage/xtradb/handler/ha_innodb.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index f0a62d10617..e2ea4331d38 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -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) {