Merge
This commit is contained in:
commit
7e576c0710
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user