diff options
| author | unknown <joerg@trift2.> | 2007-08-15 12:52:47 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-08-15 12:52:47 +0200 |
| commit | 582b682a622cee869849daada8e3e35609b47137 (patch) | |
| tree | 7cdf83a378da771ea2323797cb9a29b0d87a2f2c /storage/innobase | |
| parent | 4cfe994ebcc9c9f1ff710694916a1d6b1e22af7f (diff) | |
| parent | 9d819b7d7f748b41e137b1eb94495156041a2593 (diff) | |
| download | mariadb-git-582b682a622cee869849daada8e3e35609b47137.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index f606134578a..05447f75e95 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -604,7 +604,6 @@ convert_error_code_to_mysql( thd_mark_transaction_to_rollback(thd, TRUE); return(HA_ERR_LOCK_DEADLOCK); - } else if (error == (int) DB_LOCK_WAIT_TIMEOUT) { /* Starting from 5.0.13, we let MySQL just roll back the |