diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-11-21 19:47:46 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-11-21 19:47:46 +0100 |
| commit | 7f1900705b28a432a91595726f7d58e6d968cbd5 (patch) | |
| tree | a24724ebc45941490e2970d87c495bc5f5cbb64b /sql/wsrep_mysqld.cc | |
| parent | 375caf99c494a4add7d48d5db3a3ec4b409a256e (diff) | |
| parent | b54aeeb080aba2385204cdd09cba3eedbbf1b891 (diff) | |
| download | mariadb-git-7f1900705b28a432a91595726f7d58e6d968cbd5.tar.gz | |
Merge branch '10.1' into 10.2
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 d95c85f3008..2ac158817cb 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -2021,7 +2021,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; |