From 8f8bc3629d83ea717d9f6e7ee74539379a569033 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Sat, 7 Jan 2012 10:23:46 +0200 Subject: Fixed wrong merge --- sql/sql_parse.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'sql/sql_parse.cc') 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 -- cgit v1.2.1