diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-10-07 00:18:26 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-10-07 00:18:26 +0300 |
| commit | 06a7eeb992fe881f056fe83a8b716b3a81f224ff (patch) | |
| tree | 040570f7c8d59753417edfc413d88a6b22ef09b8 /sql/wsrep_hton.cc | |
| parent | 337fdb80f3edf3c6fdb47fbd06d044abbafc7041 (diff) | |
| download | mariadb-git-06a7eeb992fe881f056fe83a8b716b3a81f224ff.tar.gz | |
Merged revisions 3411..3417 from mariadb-galera-5.5
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index fe3b5097278..bd934031fc3 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -48,8 +48,8 @@ void wsrep_cleanup_transaction(THD *thd) if (wsrep->post_commit(wsrep, &thd->wsrep_trx_handle)) { DBUG_PRINT("wsrep", ("set committed fail")); - WSREP_WARN("set committed fail: %llu %d", - (long long)thd->real_id, thd->get_stmt_da()->status()); + WSREP_WARN("set committed fail: %llu %d", + (long long)thd->real_id, thd->stmt_da->status()); } } //else @@ -194,9 +194,9 @@ wsrep_run_wsrep_commit( IO_CACHE *cache; int replay_round= 0; - 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()); + if (thd->stmt_da->is_error()) { + WSREP_ERROR("commit issue, error: %d %s", + thd->stmt_da->sql_errno(), thd->stmt_da->message()); } DBUG_ENTER("wsrep_run_wsrep_commit"); @@ -303,23 +303,23 @@ wsrep_run_wsrep_commit( DBUG_RETURN(WSREP_TRX_ROLLBACK); } } - if (data_len == 0) + if (data_len == 0) { mysql_mutex_lock(&thd->LOCK_wsrep_thd); thd->wsrep_exec_mode = LOCAL_COMMIT; mysql_mutex_unlock(&thd->LOCK_wsrep_thd); - if (thd->get_stmt_da()->is_ok() && - thd->get_stmt_da()->affected_rows() > 0 && + if (thd->stmt_da->is_ok() && + thd->stmt_da->affected_rows() > 0 && !binlog_filter->is_on()) { WSREP_DEBUG("empty rbr buffer, query: %s, " - "affected rows: %llu, " - "changed tables: %d, " + "affected rows: %llu, " + "changed tables: %d, " "sql_log_bin: %d, " "wsrep status (%d %d %d)", - thd->query(), thd->get_stmt_da()->affected_rows(), + thd->query(), thd->stmt_da->affected_rows(), stmt_has_updated_trans_table(thd), thd->variables.sql_log_bin, - thd->wsrep_exec_mode, thd->wsrep_query_state, + thd->wsrep_exec_mode, thd->wsrep_query_state, thd->wsrep_conflict_state); } else |