diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-21 13:23:15 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-21 13:23:15 +0200 |
| commit | 2be9a419f5e680dbb9b02fe6ce1f07d2442ae938 (patch) | |
| tree | 895e62e84e88592863c870a9aadf4f56cb64d0d6 | |
| parent | a3e8ce275c9de6e01bce1c0d4a44e0a4b9a8b867 (diff) | |
| download | mariadb-git-2be9a419f5e680dbb9b02fe6ce1f07d2442ae938.tar.gz | |
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
| -rw-r--r-- | sql/sql_parse.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 41f308a2ce4..8c51ea69618 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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)) |