Commit 2be9a419 authored by Michael Widenius's avatar Michael Widenius

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


sql/sql_parse.cc:
  Only call ha_maria::implicit_commit if aria is enabled
parent a3e8ce27
...@@ -190,7 +190,8 @@ bool end_active_trans(THD *thd) ...@@ -190,7 +190,8 @@ bool end_active_trans(THD *thd)
if (ha_commit(thd)) if (ha_commit(thd))
error=1; error=1;
#ifdef WITH_MARIA_STORAGE_ENGINE #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 #endif
} }
thd->options&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); thd->options&= ~(OPTION_BEGIN | OPTION_KEEP_LOG);
...@@ -1297,6 +1298,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1297,6 +1298,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
char *beginning_of_next_stmt= (char*) end_of_stmt; char *beginning_of_next_stmt= (char*) end_of_stmt;
#ifdef WITH_MARIA_STORAGE_ENGINE #ifdef WITH_MARIA_STORAGE_ENGINE
if (ha_storage_engine_is_enabled(maria_hton))
ha_maria::implicit_commit(thd, FALSE); ha_maria::implicit_commit(thd, FALSE);
#endif #endif
...@@ -1722,7 +1724,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -1722,7 +1724,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
thd->transaction.stmt.reset(); thd->transaction.stmt.reset();
#ifdef WITH_MARIA_STORAGE_ENGINE #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 #endif
if (!(sql_command_flags[thd->lex->sql_command] & CF_CHANGES_DATA)) if (!(sql_command_flags[thd->lex->sql_command] & CF_CHANGES_DATA))
......
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