1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.0 into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä 2018-01-04 20:42:29 +02:00
commit 21470de148
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
storage/innobase/trx/trx0roll.cc
View File

@ -1,7 +1,7 @@
/***************************************************************************** /*****************************************************************************
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
@ -739,7 +739,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)) {
@ -753,9 +754,9 @@ 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);
sd_notifyf(0, "STATUS=To roll back: " ULINTPF " transactions, " 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); mutex_exit(&recv_sys->mutex);

9
storage/xtradb/trx/trx0roll.cc
View File

@ -1,7 +1,7 @@
/***************************************************************************** /*****************************************************************************
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
@ -751,7 +751,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)) {
@ -765,9 +766,9 @@ 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);
sd_notifyf(0, "STATUS=To roll back: " ULINTPF " transactions, " 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); mutex_exit(&recv_sys->mutex);