Commit d2f8bb18 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:2927], fix issue

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@23783 c7de825b-a66e-492c-adef-691d508d4ae1
parent 300cefb2
...@@ -4152,6 +4152,9 @@ int ha_tokudb::index_end() { ...@@ -4152,6 +4152,9 @@ int ha_tokudb::index_end() {
int ha_tokudb::handle_cursor_error(int error, int err_to_return, uint keynr) { int ha_tokudb::handle_cursor_error(int error, int err_to_return, uint keynr) {
TOKUDB_DBUG_ENTER("ha_tokudb::handle_cursor_error"); TOKUDB_DBUG_ENTER("ha_tokudb::handle_cursor_error");
if (error) { if (error) {
if (error == DB_LOCK_NOTGRANTED) {
error = HA_ERR_LOCK_WAIT_TIMEOUT;
}
last_cursor_error = error; last_cursor_error = error;
table->status = STATUS_NOT_FOUND; table->status = STATUS_NOT_FOUND;
int r = cursor->c_close(cursor); int r = cursor->c_close(cursor);
...@@ -4302,6 +4305,9 @@ int ha_tokudb::read_full_row(uchar * buf) { ...@@ -4302,6 +4305,9 @@ int ha_tokudb::read_full_row(uchar * buf) {
lockretry_wait; lockretry_wait;
} }
if (error) { if (error) {
if (error == DB_LOCK_NOTGRANTED) {
error = HA_ERR_LOCK_WAIT_TIMEOUT;
}
table->status = STATUS_NOT_FOUND; table->status = STATUS_NOT_FOUND;
TOKUDB_DBUG_RETURN(error == DB_NOTFOUND ? HA_ERR_CRASHED : error); TOKUDB_DBUG_RETURN(error == DB_NOTFOUND ? HA_ERR_CRASHED : error);
} }
......
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