diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-01-07 14:59:03 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-01-07 14:59:03 +0200 |
| commit | 7e576c07103fc27e8d2a6a4f6d709426cc782f44 (patch) | |
| tree | 0aee6e543375b58af631e9c1dd18614702058085 | |
| parent | d63fc00f35e40315848133991ca6f336e3f87eb9 (diff) | |
| parent | d725c52d27cb206bb0dc17c629535655a11885c2 (diff) | |
| download | mariadb-git-7e576c07103fc27e8d2a6a4f6d709426cc782f44.tar.gz | |
Merge
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 8aed1229f5b..1510ea7bf10 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -190,7 +190,6 @@ bool end_active_trans(THD *thd) if (ha_commit(thd)) error=1; #ifdef WITH_ARIA_STORAGE_ENGINE - ha_maria::implicit_commit(thd, TRUE); if (ha_storage_engine_is_enabled(maria_hton)) ha_maria::implicit_commit(thd, TRUE); #endif @@ -1664,7 +1663,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd, thd->transaction.stmt.reset(); #ifdef WITH_ARIA_STORAGE_ENGINE - ha_maria::implicit_commit(thd, FALSE); if (ha_storage_engine_is_enabled(maria_hton)) ha_maria::implicit_commit(thd, FALSE); #endif |