diff options
| author | unknown <elliot@mysql.com> | 2006-03-17 10:50:01 +0100 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2006-03-17 10:50:01 +0100 |
| commit | 4542ef186be431e1ecb74e69879e802a6fa2db18 (patch) | |
| tree | d607bb917e891eb4c34cba16583802a347b5bc1f /sql/ha_innodb.cc | |
| parent | 0112880cd650d8570bd4d6191924178a34b1d5bd (diff) | |
| parent | 608d060c0499a83443991054e664718a48fe7f23 (diff) | |
| download | mariadb-git-4542ef186be431e1ecb74e69879e802a6fa2db18.tar.gz | |
Merge mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-4.1
into mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.0
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 1b1326920ad..b386439aed5 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -513,6 +513,13 @@ convert_error_code_to_mysql( return(HA_ERR_NO_SAVEPOINT); } else if (error == (int) DB_LOCK_TABLE_FULL) { + /* Since we rolled back the whole transaction, we must + tell it also to MySQL so that MySQL knows to empty the + cached binlog for this transaction */ + + if (thd) { + ha_rollback(thd); + } return(HA_ERR_LOCK_TABLE_FULL); } else { |