diff options
| author | monty@hundin.mysql.fi <> | 2001-08-21 20:06:00 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-08-21 20:06:00 +0300 |
| commit | 063a1a6557ad2c501f4da9a47e633fb191ee2e00 (patch) | |
| tree | cc0b5646a48d97a66571d12ba2d4c29f6c1059e5 /sql/handler.cc | |
| parent | 301af97d4a1e09ce7da0d8ee63c13210a786891d (diff) | |
| download | mariadb-git-063a1a6557ad2c501f4da9a47e633fb191ee2e00.tar.gz | |
Portability fixes.
Patches required by Gemini
Fix to properly detect if there is an active transaction in InnoDB
Fix to not lock thread structure when doing automatic rollback when thread ends
Allow -O lower_case_names=0 on UNIX
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 bac24a6dba7..bb17d8f2331 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 |