Skip to content

Commit 4496fd7

Browse files
committed
Fix a truncation warning introduced in MDEV-12323
1 parent 8ac1982 commit 4496fd7

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

storage/innobase/trx/trx0roll.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2016, 2017, MariaDB Corporation.
4+
Copyright (c) 2016, 2018, MariaDB Corporation.
55
66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -735,7 +735,8 @@ trx_roll_must_shutdown()
735735
mutex_enter(&recv_sys->mutex);
736736

737737
if (recv_sys->report(time)) {
738-
ulint n_trx = 0, n_rows = 0;
738+
ulint n_trx = 0;
739+
ulonglong n_rows = 0;
739740
for (const trx_t* t = UT_LIST_GET_FIRST(trx_sys->rw_trx_list);
740741
t != NULL;
741742
t = UT_LIST_GET_NEXT(trx_list, t)) {
@@ -749,7 +750,7 @@ trx_roll_must_shutdown()
749750
}
750751
ib_logf(IB_LOG_LEVEL_INFO,
751752
"To roll back: " ULINTPF " transactions, "
752-
ULINTPF " rows", n_trx, n_rows);
753+
"%llu rows", n_trx, n_rows);
753754
}
754755

755756
mutex_exit(&recv_sys->mutex);

storage/xtradb/trx/trx0roll.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2016, 2017, MariaDB Corporation.
4+
Copyright (c) 2016, 2018, MariaDB Corporation.
55
66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -735,7 +735,8 @@ trx_roll_must_shutdown()
735735
mutex_enter(&recv_sys->mutex);
736736

737737
if (recv_sys->report(time)) {
738-
ulint n_trx = 0, n_rows = 0;
738+
ulint n_trx = 0;
739+
ulonglong n_rows = 0;
739740
for (const trx_t* t = UT_LIST_GET_FIRST(trx_sys->rw_trx_list);
740741
t != NULL;
741742
t = UT_LIST_GET_NEXT(trx_list, t)) {
@@ -749,7 +750,7 @@ trx_roll_must_shutdown()
749750
}
750751
ib_logf(IB_LOG_LEVEL_INFO,
751752
"To roll back: " ULINTPF " transactions, "
752-
ULINTPF " rows", n_trx, n_rows);
753+
"%llu rows", n_trx, n_rows);
753754
}
754755

755756
mutex_exit(&recv_sys->mutex);

0 commit comments

Comments
 (0)