diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 18:56:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-20 18:56:41 +0200 |
| commit | 63c834e7c44d45acceb2110a1970c9719655fdc6 (patch) | |
| tree | fb596f5a3ad7c30a544708a77cc66ebb87acc1a9 /storage/xtradb/buf | |
| parent | 24ac546d0f16d5f56b11c068e4f187a9c4c56bd0 (diff) | |
| parent | c9e56d5ca9ebd0737ed543a7e1b3c990a8ab94fa (diff) | |
| download | mariadb-git-63c834e7c44d45acceb2110a1970c9719655fdc6.tar.gz | |
Merge branch 'merge-xtradb-5.5' into 5.5
Diffstat (limited to 'storage/xtradb/buf')
| -rw-r--r-- | storage/xtradb/buf/buf0flu.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/storage/xtradb/buf/buf0flu.c b/storage/xtradb/buf/buf0flu.c index 43f6a4510a2..45fe2aa3f53 100644 --- a/storage/xtradb/buf/buf0flu.c +++ b/storage/xtradb/buf/buf0flu.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. 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 @@ -2214,12 +2214,7 @@ buf_flush_stat_update(void) ib_uint64_t lsn; ulint n_flushed; - lsn = log_get_lsn_nowait(); - - /* log_get_lsn_nowait tries to get log_sys->mutex with - mutex_enter_nowait, if this does not succeed function - returns 0, do not use that value to update stats. */ - if (lsn == 0) { + if (!log_peek_lsn(&lsn)) { return; } |