database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixes lp:907049 "Server started with skip-aria crashes on an attempt to connect to it"

Browse Source 
sql/sql_parse.cc:
  Only call ha_maria::implicit_commit if aria is enabled
This commit is contained in:
Michael Widenius
2011-12-21 13:23:15 +02:00
parent a3e8ce275c
commit 2be9a419f5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@ -190,7 +190,8 @@ bool end_active_trans(THD *thd)
if (ha_commit(thd))
error=1;
#ifdef WITH_MARIA_STORAGE_ENGINE
ha_maria::implicit_commit(thd, TRUE);
if (ha_storage_engine_is_enabled(maria_hton))
ha_maria::implicit_commit(thd, TRUE);
#endif
}
thd->options&= ~(OPTION_BEGIN | OPTION_KEEP_LOG);
@ -1297,6 +1298,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
char *beginning_of_next_stmt= (char*) end_of_stmt;
#ifdef WITH_MARIA_STORAGE_ENGINE
if (ha_storage_engine_is_enabled(maria_hton))
ha_maria::implicit_commit(thd, FALSE);
#endif
@ -1722,7 +1724,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
thd->transaction.stmt.reset();
#ifdef WITH_MARIA_STORAGE_ENGINE
ha_maria::implicit_commit(thd, FALSE);
if (ha_storage_engine_is_enabled(maria_hton))
ha_maria::implicit_commit(thd, FALSE);
#endif
if (!(sql_command_flags[thd->lex->sql_command] & CF_CHANGES_DATA))