[Commits] 22ca528: pre-review

Oleksandr Byelkin sanja at mariadb.com
Sat Oct 8 12:07:25 EEST 2016


revision-id: 22ca528059b1346a9c15373cdae0c22fbfaad331 (mariadb-10.2.2-15-g22ca528)
parent(s): f1065f51aaed40e08447221b3517bcccb026cfd5
committer: Oleksandr Byelkin
timestamp: 2016-10-08 11:07:25 +0200
message:

pre-review

---
 sql/sql_prepare.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 65b373d..12f1ec8 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -4199,13 +4199,14 @@ Prepared_statement::execute_bulk_loop(String *expanded_query,
       switch (thd->wsrep_conflict_state)
       {
       case CERT_FAILURE:
-        WSREP_DEBUG("PS execute fail for CERT_FAILURE: thd: %ld err: %d",
-                    thd->thread_id, thd->get_stmt_da()->sql_errno() );
+        WSREP_DEBUG("PS execute fail for CERT_FAILURE: thd: %lld  err: %d",
+	            (longlong) thd->thread_id,
+                    thd->get_stmt_da()->sql_errno() );
         thd->wsrep_conflict_state = NO_CONFLICT;
         break;
 
       case MUST_REPLAY:
-        (void)wsrep_replay_transaction(thd);
+        (void) wsrep_replay_transaction(thd);
         break;
 
       default:


More information about the commits mailing list