diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-08-11 02:00:51 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-08-11 02:00:51 +0500 |
| commit | 6aa5fa3a1dbbee863fb4a0da153cedff6b69a418 (patch) | |
| tree | 2380b8a509f41895330745de2a1f4255304c4929 /storage/innobase | |
| parent | 6930ac54068b88ce5ca2476f70d74ddb42f5d9fc (diff) | |
| parent | 124ad307e3306fc1de749234b7a4e7708f620d57 (diff) | |
| download | mariadb-git-6aa5fa3a1dbbee863fb4a0da153cedff6b69a418.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.1
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/field.cc:
Auto merged
BitKeeper/deleted/.del-readme.txt~3:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/sql_select.cc:
Merge with main tree.
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 |