From 517e746d781d3e88992d0d60fe2c72ef1b404279 Mon Sep 17 00:00:00 2001 From: Zardosht Kasheff Date: Wed, 17 Apr 2013 00:02:02 -0400 Subject: [PATCH] [t:2927], fix issue git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@23783 c7de825b-a66e-492c-adef-691d508d4ae1 --- storage/tokudb/ha_tokudb.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 2b5390fe987..fb12c3caf78 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -4152,6 +4152,9 @@ int ha_tokudb::index_end() { int ha_tokudb::handle_cursor_error(int error, int err_to_return, uint keynr) { TOKUDB_DBUG_ENTER("ha_tokudb::handle_cursor_error"); if (error) { + if (error == DB_LOCK_NOTGRANTED) { + error = HA_ERR_LOCK_WAIT_TIMEOUT; + } last_cursor_error = error; table->status = STATUS_NOT_FOUND; int r = cursor->c_close(cursor); @@ -4302,6 +4305,9 @@ int ha_tokudb::read_full_row(uchar * buf) { lockretry_wait; } if (error) { + if (error == DB_LOCK_NOTGRANTED) { + error = HA_ERR_LOCK_WAIT_TIMEOUT; + } table->status = STATUS_NOT_FOUND; TOKUDB_DBUG_RETURN(error == DB_NOTFOUND ? HA_ERR_CRASHED : error); }