summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-01-04 20:38:42 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-01-04 20:39:00 +0200
commit4496fd71f47e340b60e90d8f99987d36013b7927 (patch)
tree4c18a186fb0660a599de0488a257677e69dc00fd
parent8ac1982fcc116f00123b5a6a485163170d48071b (diff)
downloadmariadb-git-4496fd71f47e340b60e90d8f99987d36013b7927.tar.gz
Fix a truncation warning introduced in MDEV-12323
-rw-r--r--storage/innobase/trx/trx0roll.cc7
-rw-r--r--storage/xtradb/trx/trx0roll.cc7
2 files changed, 8 insertions, 6 deletions
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc
index ab488b06121..a9f3da0dc89 100644
--- a/storage/innobase/trx/trx0roll.cc
+++ b/storage/innobase/trx/trx0roll.cc
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2016, 2017, MariaDB Corporation.
+Copyright (c) 2016, 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -735,7 +735,8 @@ trx_roll_must_shutdown()
mutex_enter(&recv_sys->mutex);
if (recv_sys->report(time)) {
- ulint n_trx = 0, n_rows = 0;
+ ulint n_trx = 0;
+ ulonglong n_rows = 0;
for (const trx_t* t = UT_LIST_GET_FIRST(trx_sys->rw_trx_list);
t != NULL;
t = UT_LIST_GET_NEXT(trx_list, t)) {
@@ -749,7 +750,7 @@ trx_roll_must_shutdown()
}
ib_logf(IB_LOG_LEVEL_INFO,
"To roll back: " ULINTPF " transactions, "
- ULINTPF " rows", n_trx, n_rows);
+ "%llu rows", n_trx, n_rows);
}
mutex_exit(&recv_sys->mutex);
diff --git a/storage/xtradb/trx/trx0roll.cc b/storage/xtradb/trx/trx0roll.cc
index ab488b06121..a9f3da0dc89 100644
--- a/storage/xtradb/trx/trx0roll.cc
+++ b/storage/xtradb/trx/trx0roll.cc
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2016, 2017, MariaDB Corporation.
+Copyright (c) 2016, 2018, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@@ -735,7 +735,8 @@ trx_roll_must_shutdown()
mutex_enter(&recv_sys->mutex);
if (recv_sys->report(time)) {
- ulint n_trx = 0, n_rows = 0;
+ ulint n_trx = 0;
+ ulonglong n_rows = 0;
for (const trx_t* t = UT_LIST_GET_FIRST(trx_sys->rw_trx_list);
t != NULL;
t = UT_LIST_GET_NEXT(trx_list, t)) {
@@ -749,7 +750,7 @@ trx_roll_must_shutdown()
}
ib_logf(IB_LOG_LEVEL_INFO,
"To roll back: " ULINTPF " transactions, "
- ULINTPF " rows", n_trx, n_rows);
+ "%llu rows", n_trx, n_rows);
}
mutex_exit(&recv_sys->mutex);