diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 17:07:17 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 17:07:17 -0400 |
| commit | 0b98d2fd2ab337d95b6b502b15ea86368c441026 (patch) | |
| tree | 43b49a7f5ccb94114797fcae41015ab9055685c4 /sql/wsrep_hton.cc | |
| parent | 0903e2b744f627f57a99edd5d2b6ffdec1ef4a03 (diff) | |
| download | mariadb-git-0b98d2fd2ab337d95b6b502b15ea86368c441026.tar.gz | |
bzr merge -r4065..4088 codership/5.6
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index a1de760ad9e..48577a9b5a1 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -77,10 +77,10 @@ void wsrep_register_hton(THD* thd, bool all) trans_register_ha(thd, all, wsrep_hton); /* follow innodb read/write settting - * but, as an exception: CTAS with empty result set will not be + * but, as an exception: CTAS with empty result set will not be * replicated unless we declare wsrep hton as read/write here */ - if (i->is_trx_read_write() || + if (i->is_trx_read_write() || (thd->lex->sql_command == SQLCOM_CREATE_TABLE && thd->wsrep_exec_mode == LOCAL_STATE)) { @@ -104,7 +104,7 @@ void wsrep_post_commit(THD* thd, bool all) if (wsrep->post_commit(wsrep, &thd->wsrep_ws_handle)) { DBUG_PRINT("wsrep", ("set committed fail")); - WSREP_WARN("set committed fail: %llu %d", + WSREP_WARN("set committed fail: %llu %d", (long long)thd->real_id, thd->get_stmt_da()->status()); } wsrep_cleanup_transaction(thd); @@ -202,7 +202,7 @@ static int wsrep_rollback(handlerton *hton, THD *thd, bool all) switch (thd->wsrep_exec_mode) { case TOTAL_ORDER: - case REPL_RECV: + case REPL_RECV: mysql_mutex_unlock(&thd->LOCK_wsrep_thd); WSREP_DEBUG("Avoiding wsrep rollback for failed DDL: %s", thd->query()); DBUG_RETURN(0); @@ -280,7 +280,7 @@ wsrep_run_wsrep_commit(THD *thd, handlerton *hton, bool all) int replay_round= 0; if (thd->get_stmt_da()->is_error()) { - WSREP_ERROR("commit issue, error: %d %s", + WSREP_ERROR("commit issue, error: %d %s", thd->get_stmt_da()->sql_errno(), thd->get_stmt_da()->message()); } |