diff options
| author | unknown <igor@olga.mysql.com> | 2007-08-04 22:36:54 -0700 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-08-04 22:36:54 -0700 |
| commit | 03e379d36f1b734a9433a796b653076f94633f11 (patch) | |
| tree | 6c59e80772a05c48ffc8db3d039320e4f1507503 /storage | |
| parent | 78a52138c7aaee9ec67c1041d9b7ecd2e45fc79a (diff) | |
| parent | 35249143023c2a59631a1b26759a56826852c149 (diff) | |
| download | mariadb-git-03e379d36f1b734a9433a796b653076f94633f11.tar.gz | |
Merge olga.mysql.com:/home/igor/mysql-5.1
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
mysql-test/include/read_many_rows.inc:
Auto merged
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/read_many_rows_innodb.result:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_class.h:
Manual merge.
storage/innobase/handler/ha_innodb.cc:
Manual merge.
Diffstat (limited to 'storage')
| -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 |