diff options
| author | monty@mysql.com <> | 2004-06-25 20:13:05 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-06-25 20:13:05 +0300 |
| commit | b1d08ba2b423bd6d88aaa0efaba1807f7e792a47 (patch) | |
| tree | 983268d5f30394d4fa4ffdd75cd095f6227e5170 /sql/handler.cc | |
| parent | f6765146c1b97bbb71f79adbd275dc2b6ca79333 (diff) | |
| parent | c3eb93604085134940f89c7d12366d431ced9ea9 (diff) | |
| download | mariadb-git-b1d08ba2b423bd6d88aaa0efaba1807f7e792a47.tar.gz | |
Merge with 4.0 to get the latest bug patches to 4.1
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index e278d1a5308..017b9d9d4c8 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -625,13 +625,12 @@ int ha_rollback_trans(THD *thd, THD_TRANS *trans) reinit_io_cache(&thd->transaction.trans_log, WRITE_CACHE, (my_off_t) 0, 0, 1); thd->transaction.trans_log.end_of_file= max_binlog_cache_size; + if (operation_done) + thd->transaction.cleanup(); } thd->variables.tx_isolation=thd->session_tx_isolation; if (operation_done) - { statistic_increment(ha_rollback_count,&LOCK_status); - thd->transaction.cleanup(); - } } #endif /* USING_TRANSACTIONS */ DBUG_RETURN(error); |