diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
| commit | da4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch) | |
| tree | 7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /storage/xtradb/trx/trx0roll.cc | |
| parent | 9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff) | |
| parent | a00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff) | |
| download | mariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/xtradb/trx/trx0roll.cc')
| -rw-r--r-- | storage/xtradb/trx/trx0roll.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/storage/xtradb/trx/trx0roll.cc b/storage/xtradb/trx/trx0roll.cc index ee1497b209f..d228743d300 100644 --- a/storage/xtradb/trx/trx0roll.cc +++ b/storage/xtradb/trx/trx0roll.cc @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2016, MariaDB Corporation. All Rights Reserved. +Copyright (c) 2016, 2017, 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 @@ -753,9 +753,9 @@ trx_rollback_or_clean_recovered( } if (all) { - fprintf(stderr, - "InnoDB: Starting in background the rollback" - " of uncommitted transactions\n"); + ib_logf(IB_LOG_LEVEL_INFO, + "Starting in background the rollback" + " of recovered transactions"); } /* Note: For XA recovered transactions, we rely on MySQL to @@ -775,6 +775,12 @@ trx_rollback_or_clean_recovered( assert_trx_in_rw_list(trx); + if (srv_shutdown_state != SRV_SHUTDOWN_NONE + && srv_fast_shutdown != 0) { + all = FALSE; + break; + } + /* If this function does a cleanup or rollback then it will release the trx_sys->mutex, therefore we need to reacquire it before retrying the loop. */ @@ -792,10 +798,8 @@ trx_rollback_or_clean_recovered( } while (trx != NULL); if (all) { - ut_print_timestamp(stderr); - fprintf(stderr, - " InnoDB: Rollback of non-prepared" - " transactions completed\n"); + ib_logf(IB_LOG_LEVEL_INFO, + "Rollback of non-prepared transactions completed"); } } |