diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-08 20:26:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-01-08 21:27:30 +0100 |
| commit | 86551362229c8f110575234a98598e4e8af7a707 (patch) | |
| tree | 91232e514366eeb2f5e782dc97938f7ca0756053 /sql/wsrep_hton.cc | |
| parent | 4ce39dca99568677daf8cedafc2cbaa169e4eb7d (diff) | |
| download | mariadb-git-86551362229c8f110575234a98598e4e8af7a707.tar.gz | |
remove wsrep_hton dependency from innodb/xtradb
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index 2c14809db21..36be70249ca 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -27,9 +27,6 @@ extern ulonglong thd_to_trx_id(THD *thd); extern "C" int thd_binlog_format(const MYSQL_THD thd); // todo: share interface with ha_innodb.c -enum wsrep_trx_status wsrep_run_wsrep_commit(THD *thd, handlerton *hton, - bool all); - /* Cleanup after local transaction commit/rollback, replay or TOI. */ @@ -157,7 +154,7 @@ static int wsrep_prepare(handlerton *hton, THD *thd, bool all) !thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) && (thd->variables.wsrep_on && !wsrep_trans_cache_is_empty(thd))) { - int res= wsrep_run_wsrep_commit(thd, hton, all); + int res= wsrep_run_wsrep_commit(thd, all); if (res != 0) { if (res == WSREP_TRX_SIZE_EXCEEDED) @@ -281,20 +278,19 @@ extern Rpl_filter* binlog_filter; extern my_bool opt_log_slave_updates; enum wsrep_trx_status -wsrep_run_wsrep_commit(THD *thd, handlerton *hton, bool all) +wsrep_run_wsrep_commit(THD *thd, bool all) { int rcode= -1; size_t data_len= 0; IO_CACHE *cache; int replay_round= 0; + DBUG_ENTER("wsrep_run_wsrep_commit"); if (thd->get_stmt_da()->is_error()) { WSREP_ERROR("commit issue, error: %d %s", thd->get_stmt_da()->sql_errno(), thd->get_stmt_da()->message()); } - DBUG_ENTER("wsrep_run_wsrep_commit"); - if (thd->slave_thread && !opt_log_slave_updates) DBUG_RETURN(WSREP_TRX_OK); if (thd->wsrep_exec_mode == REPL_RECV) { |