Addresses #628 See mysql/doc/deadlock.txt and change history in this ticket for further comments

git-svn-id: file:///svn/mysql/tokudb-engine/src@3243 c7de825b-a66e-492c-adef-691d508d4ae1
13 years ago · e1e4eec722
1 changed files with 1 additions and 1 deletions
--- a/storage/tokudb/ha_tokudb.cc
+++ b/storage/tokudb/ha_tokudb.cc
@ -2501,7 +2501,7 @@ void ha_tokudb::print_error(int error, myf errflag) {
    if (error == DB_LOCK_DEADLOCK)
        error = HA_ERR_LOCK_DEADLOCK;
    if (error == DB_LOCK_NOTGRANTED)
-        error = ER_CANT_LOCK;
+        error = HA_ERR_LOCK_WAIT_TIMEOUT;
    handler::print_error(error, errflag);
 }