Commit 4496fd71 authored by Marko Mäkelä's avatar Marko Mäkelä

Fix a truncation warning introduced in MDEV-12323

parent 8ac1982f
/***************************************************************************** /*****************************************************************************
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. 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 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 the terms of the GNU General Public License as published by the Free Software
...@@ -735,7 +735,8 @@ trx_roll_must_shutdown() ...@@ -735,7 +735,8 @@ trx_roll_must_shutdown()
mutex_enter(&recv_sys->mutex); mutex_enter(&recv_sys->mutex);
if (recv_sys->report(time)) { 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); for (const trx_t* t = UT_LIST_GET_FIRST(trx_sys->rw_trx_list);
t != NULL; t != NULL;
t = UT_LIST_GET_NEXT(trx_list, t)) { t = UT_LIST_GET_NEXT(trx_list, t)) {
...@@ -749,7 +750,7 @@ trx_roll_must_shutdown() ...@@ -749,7 +750,7 @@ trx_roll_must_shutdown()
} }
ib_logf(IB_LOG_LEVEL_INFO, ib_logf(IB_LOG_LEVEL_INFO,
"To roll back: " ULINTPF " transactions, " "To roll back: " ULINTPF " transactions, "
ULINTPF " rows", n_trx, n_rows); "%llu rows", n_trx, n_rows);
} }
mutex_exit(&recv_sys->mutex); mutex_exit(&recv_sys->mutex);
......
/***************************************************************************** /*****************************************************************************
Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved. 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 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 the terms of the GNU General Public License as published by the Free Software
...@@ -735,7 +735,8 @@ trx_roll_must_shutdown() ...@@ -735,7 +735,8 @@ trx_roll_must_shutdown()
mutex_enter(&recv_sys->mutex); mutex_enter(&recv_sys->mutex);
if (recv_sys->report(time)) { 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); for (const trx_t* t = UT_LIST_GET_FIRST(trx_sys->rw_trx_list);
t != NULL; t != NULL;
t = UT_LIST_GET_NEXT(trx_list, t)) { t = UT_LIST_GET_NEXT(trx_list, t)) {
...@@ -749,7 +750,7 @@ trx_roll_must_shutdown() ...@@ -749,7 +750,7 @@ trx_roll_must_shutdown()
} }
ib_logf(IB_LOG_LEVEL_INFO, ib_logf(IB_LOG_LEVEL_INFO,
"To roll back: " ULINTPF " transactions, " "To roll back: " ULINTPF " transactions, "
ULINTPF " rows", n_trx, n_rows); "%llu rows", n_trx, n_rows);
} }
mutex_exit(&recv_sys->mutex); mutex_exit(&recv_sys->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment