diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-04 20:42:29 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-04 20:42:29 +0200 |
| commit | 21470de1481d74df1f262cd0e16403c23baddd30 (patch) | |
| tree | 60fe98ff4be34eda5009f0d9555adb8114df7de1 | |
| parent | 1e89c86dd7c21684039c5fa777c358fc2112aec6 (diff) | |
| parent | 4496fd71f47e340b60e90d8f99987d36013b7927 (diff) | |
| download | mariadb-git-21470de1481d74df1f262cd0e16403c23baddd30.tar.gz | |
Merge 10.0 into 10.1
| -rw-r--r-- | storage/innobase/trx/trx0roll.cc | 9 | ||||
| -rw-r--r-- | storage/xtradb/trx/trx0roll.cc | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc index 2c7287d44cf..e5c57aa21ce 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 @@ -739,7 +739,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)) { @@ -753,9 +754,9 @@ 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); sd_notifyf(0, "STATUS=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 9a5fcea71de..1075064a2d6 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 @@ -751,7 +751,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)) { @@ -765,9 +766,9 @@ 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); sd_notifyf(0, "STATUS=To roll back: " ULINTPF " transactions, " - ULINTPF " rows", n_trx, n_rows); + "%llu rows", n_trx, n_rows); } mutex_exit(&recv_sys->mutex); |