diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-02 19:58:08 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-02 19:58:08 +0300 |
| commit | 3719b87396063fadf9a88a6acc6584f1321a7d6a (patch) | |
| tree | c1066773b871f44ebb365c32dab0432f7da6da94 /sql/handler.cc | |
| parent | fa7b17e904a73da0e938eac8e8d1503838d78202 (diff) | |
| parent | ddee00a6edc735b3bbef42b7d0d662091debd560 (diff) | |
| download | mariadb-git-3719b87396063fadf9a88a6acc6584f1321a7d6a.tar.gz | |
merge
configure.in:
Auto merged
sql/ha_innobase.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 94910b24622..fbf5144c090 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -286,6 +286,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans) my_error(ER_ERROR_DURING_COMMIT, MYF(0), error); error=1; } + trans->innodb_active_trans=0; } #endif #ifdef HAVE_GEMINI_DB @@ -337,6 +338,7 @@ int ha_rollback_trans(THD *thd, THD_TRANS *trans) my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), error); error=1; } + trans->innodb_active_trans=0; } #endif #ifdef HAVE_GEMINI_DB |