Skip to content

M
MariaDB
Commit d725c52d authored by Michael Widenius's avatar Michael Widenius
Browse files
Options

Fixed wrong merge

parent 98135fed
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
sql/sql_parse.cc
View file @ d725c52d
...@@ -190,7 +190,6 @@ bool end_active_trans(THD *thd) ...@@ -190,7 +190,6 @@ bool end_active_trans(THD *thd)
if (ha_commit(thd)) if (ha_commit(thd))
error=1; error=1;
#ifdef WITH_ARIA_STORAGE_ENGINE #ifdef WITH_ARIA_STORAGE_ENGINE
ha_maria::implicit_commit(thd, TRUE);
if (ha_storage_engine_is_enabled(maria_hton)) if (ha_storage_engine_is_enabled(maria_hton))
ha_maria::implicit_commit(thd, TRUE); ha_maria::implicit_commit(thd, TRUE);
#endif #endif
...@@ -1664,7 +1663,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1664,7 +1663,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
thd->transaction.stmt.reset(); thd->transaction.stmt.reset();
#ifdef WITH_ARIA_STORAGE_ENGINE #ifdef WITH_ARIA_STORAGE_ENGINE
ha_maria::implicit_commit(thd, FALSE);
if (ha_storage_engine_is_enabled(maria_hton)) if (ha_storage_engine_is_enabled(maria_hton))
ha_maria::implicit_commit(thd, FALSE); ha_maria::implicit_commit(thd, FALSE);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7