diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-30 12:45:38 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2014-01-30 12:45:38 -0500 |
| commit | 4a6be51f78e79b1ee5bc0442b7af8b3108a64512 (patch) | |
| tree | c9a15dc1470ff64aa82fe3afdb23503d044e4299 /sql/wsrep_hton.cc | |
| parent | 5b6a4f25a566f967e8b1010998a22256bd045511 (diff) | |
| download | mariadb-git-4a6be51f78e79b1ee5bc0442b7af8b3108a64512.tar.gz | |
* Merged revisions: 3431, 3435..3457, 3459, 3460 from maria-5.5-galera.
* Fixed Debian/Ubuntu dist files.
* Fixed some compiler warnings.
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index e9d1a9289ff..efb6ed87179 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -258,11 +258,13 @@ int wsrep_commit(handlerton *hton, THD *thd, bool all) Transaction didn't go through wsrep->pre_commit() so just roll back possible changes to clean state. */ - if (wsrep->post_rollback(wsrep, &thd->wsrep_ws_handle)) - { - DBUG_PRINT("wsrep", ("setting rollback fail")); - WSREP_ERROR("settting rollback fail: thd: %llu SQL: %s", - (long long)thd->real_id, thd->query()); + if (WSREP_PROVIDER_EXISTS) { + if (wsrep->post_rollback(wsrep, &thd->wsrep_ws_handle)) + { + DBUG_PRINT("wsrep", ("setting rollback fail")); + WSREP_ERROR("settting rollback fail: thd: %llu SQL: %s", + (long long)thd->real_id, thd->query()); + } } wsrep_cleanup_transaction(thd); } |