diff options
| author | Annamalai Gurusami <annamalai.gurusami@oracle.com> | 2012-06-01 11:49:07 +0530 |
|---|---|---|
| committer | Annamalai Gurusami <annamalai.gurusami@oracle.com> | 2012-06-01 11:49:07 +0530 |
| commit | 4acca3431f66088f99b608d8e0983a6ef389e9f9 (patch) | |
| tree | a67d8dc2275d650259e286693ccf1d3e1cc8e810 | |
| parent | 85c4d216326fc3e016aa32c3295db30f3a3d94b7 (diff) | |
| parent | a2bc9b36696efb97879bc1bd4500156ea52a1b1a (diff) | |
| download | mariadb-git-4acca3431f66088f99b608d8e0983a6ef389e9f9.tar.gz | |
Merge from mysql-5.1 to mysql-5.5.
| -rw-r--r-- | sql/sql_select.cc | 3 | ||||
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 193121c9a95..211b10617fa 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -12075,7 +12075,8 @@ int report_error(TABLE *table, int error) Locking reads can legally return also these errors, do not print them to the .err log */ - if (error != HA_ERR_LOCK_DEADLOCK && error != HA_ERR_LOCK_WAIT_TIMEOUT) + if (error != HA_ERR_LOCK_DEADLOCK && error != HA_ERR_LOCK_WAIT_TIMEOUT + && !table->in_use->killed) sql_print_error("Got error %d when reading table '%s'", error, table->s->path.str); table->file->print_error(error,MYF(0)); diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index b0702ad3deb..19644ddc966 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -5878,6 +5878,7 @@ ha_innobase::index_read( ulint ret; DBUG_ENTER("index_read"); + DEBUG_SYNC_C("ha_innobase_index_read_begin"); ut_a(prebuilt->trx == thd_to_trx(user_thd)); ut_ad(key_len != 0 || find_flag != HA_READ_KEY_EXACT); |