diff options
| author | evgen@moonbone.local <> | 2007-07-30 18:10:34 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2007-07-30 18:10:34 +0400 |
| commit | 002696b64856d0895f6d6e9d396896fb06eb6ed8 (patch) | |
| tree | 92ec199d176c507c6baabcd0d08b943fca421c55 /sql/ha_innodb.cc | |
| parent | b6bb988d12f7df7033cbb9cebc58036d264ad26e (diff) | |
| parent | 8de5603d1d4678c9c6fbe0381674fd916fb2baef (diff) | |
| download | mariadb-git-002696b64856d0895f6d6e9d396896fb06eb6ed8.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 1c952f490da..585c825c710 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -455,9 +455,7 @@ convert_error_code_to_mysql( tell it also to MySQL so that MySQL knows to empty the cached binlog for this transaction */ - if (thd) { - ha_rollback(thd); - } + mark_transaction_to_rollback(thd, TRUE); return(HA_ERR_LOCK_DEADLOCK); @@ -467,9 +465,7 @@ convert_error_code_to_mysql( latest SQL statement in a lock wait timeout. Previously, we rolled back the whole transaction. */ - if (thd && row_rollback_on_timeout) { - ha_rollback(thd); - } + mark_transaction_to_rollback(thd, row_rollback_on_timeout); return(HA_ERR_LOCK_WAIT_TIMEOUT); @@ -521,9 +517,7 @@ convert_error_code_to_mysql( tell it also to MySQL so that MySQL knows to empty the cached binlog for this transaction */ - if (thd) { - ha_rollback(thd); - } + mark_transaction_to_rollback(thd, TRUE); return(HA_ERR_LOCK_TABLE_FULL); } else { |