mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 16:25:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed wrong merge

Browse source
This commit is contained in:
Michael Widenius 2012-01-07 10:23:46 +02:00
commit d725c52d27
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/sql_parse.cc
View file

@ -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