diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-11-29 12:06:48 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-11-29 12:06:48 +0400 |
| commit | 5b697c5a23ed7322b5b746b61e3ec66b510ca134 (patch) | |
| tree | 22f086fad2685d1a45b8531f96f30ed7fabb7554 /sql/wsrep_mysqld.cc | |
| parent | e01d33d773abbffad0ea1739f0e04816eecce89d (diff) | |
| parent | b65fd73bb19578148e41d788504ae18812c2cb43 (diff) | |
| download | mariadb-git-5b697c5a23ed7322b5b746b61e3ec66b510ca134.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 44f10559fd7..7800ec5e627 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -2022,7 +2022,7 @@ static bool abort_replicated(THD *thd) bool ret_code= false; if (thd->wsrep_query_state== QUERY_COMMITTING) { - WSREP_DEBUG("aborting replicated trx: %lu", thd->real_id); + WSREP_DEBUG("aborting replicated trx: %llu", (ulonglong)(thd->real_id)); (void)wsrep_abort_thd(thd, thd, TRUE); ret_code= true; |