mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 18:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@50139 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
John Esmet 2012-11-19 19:12:47 +00:00 • committed by Yoni Fogel
parent 914cde4466
commit a7acad88cd
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
storage/tokudb/ha_tokudb.cc
View file

@ -4320,6 +4320,9 @@ int ha_tokudb::prepare_index_key_scan(const uchar * key, uint key_len) {
error = 0;
cleanup:
if (error) {
if (error == DB_LOCK_NOTGRANTED) {
error = HA_ERR_LOCK_WAIT_TIMEOUT;
}
last_cursor_error = error;
//
// cursor should be initialized here, but in case it is not,