diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-02-05 17:54:42 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-02-05 17:54:42 +0200 |
| commit | 800fa186e3ab77ee93e75e929fe7917983e607e9 (patch) | |
| tree | c5cc3e52e73f2469e5ef3f96249938699516d8df /sql/wsrep_hton.cc | |
| parent | 9da9a242faf1fd7b2f45dc0561e5bf742a7be47b (diff) | |
| download | mariadb-git-800fa186e3ab77ee93e75e929fe7917983e607e9.tar.gz | |
merged with codership-mysql up to revision 3839
bzr merge -r3810..3839 lp:codership-mysql/5.5
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index d1be802b286..0d5a9fde7ca 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -59,6 +59,7 @@ void wsrep_cleanup_transaction(THD *thd) } thd->wsrep_exec_mode= LOCAL_STATE; } + thd->wsrep_trx_handle.trx_id = WSREP_UNDEFINED_TRX_ID; } /* @@ -321,7 +322,12 @@ wsrep_run_wsrep_commit( } DBUG_RETURN(WSREP_TRX_OK); } - if (!rcode) { + if (WSREP_UNDEFINED_TRX_ID == thd->wsrep_trx_handle.trx_id) + { + WSREP_WARN("SQL statement was ineffective: %s\n => Skipping replication", thd->query()); + } + else if (!rcode) + { rcode = wsrep->pre_commit( wsrep, (wsrep_conn_id_t)thd->thread_id, |