diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-01-07 10:23:46 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-01-07 10:23:46 +0200 |
| commit | 8f8bc3629d83ea717d9f6e7ee74539379a569033 (patch) | |
| tree | fda9f3c026e3a7ae5ed0a5042ae94edeb4089dc2 /sql/sql_parse.cc | |
| parent | ed2d3413f22f4431a92794a2015301e386decfb4 (diff) | |
| download | mariadb-git-8f8bc3629d83ea717d9f6e7ee74539379a569033.tar.gz | |
Fixed wrong merge
Diffstat (limited to 'sql/sql_parse.cc')
| -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 |