Commit a7acad88 authored by John Esmet's avatar John Esmet Committed by Yoni Fogel

refs #5351 fix a mysql test failure caused by non-shared read locks. turns out...

refs #5351 fix a mysql test failure caused by non-shared read locks. turns out the real error is that we do not consistently return ER_LOCK_WAIT_TIMEOUT on cursor errors, so mysql-tests can be very fragile.


git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@50139 c7de825b-a66e-492c-adef-691d508d4ae1
parent 914cde44
...@@ -4320,6 +4320,9 @@ int ha_tokudb::prepare_index_key_scan(const uchar * key, uint key_len) { ...@@ -4320,6 +4320,9 @@ int ha_tokudb::prepare_index_key_scan(const uchar * key, uint key_len) {
error = 0; error = 0;
cleanup: cleanup:
if (error) { if (error) {
if (error == DB_LOCK_NOTGRANTED) {
error = HA_ERR_LOCK_WAIT_TIMEOUT;
}
last_cursor_error = error; last_cursor_error = error;
// //
// cursor should be initialized here, but in case it is not, // cursor should be initialized here, but in case it is not,
......
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