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

[t:3289], fix in main

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@28546 c7de825b-a66e-492c-adef-691d508d4ae1
parent 22501d2c
...@@ -4195,6 +4195,10 @@ int ha_tokudb::index_init(uint keynr, bool sorted) { ...@@ -4195,6 +4195,10 @@ int ha_tokudb::index_init(uint keynr, bool sorted) {
error = HA_ERR_TABLE_DEF_CHANGED; error = HA_ERR_TABLE_DEF_CHANGED;
my_error(ER_TABLE_DEF_CHANGED, MYF(0)); my_error(ER_TABLE_DEF_CHANGED, MYF(0));
} }
if (error == DB_LOCK_NOTGRANTED) {
error = HA_ERR_LOCK_WAIT_TIMEOUT;
my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0));
}
table->status = STATUS_NOT_FOUND; table->status = STATUS_NOT_FOUND;
last_cursor_error = error; last_cursor_error = error;
cursor = NULL; // Safety cursor = NULL; // Safety
......
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