From a9117c90083d3f26e43c460073e06f9562b66f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Fri, 9 Jun 2017 13:44:04 +0300
Subject: [PATCH] Correct a merge error of MDEV-11626

---
 storage/xtradb/buf/buf0buf.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/storage/xtradb/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc
index 26b95926e86..1b031f5eabc 100644
--- a/storage/xtradb/buf/buf0buf.cc
+++ b/storage/xtradb/buf/buf0buf.cc
@@ -3201,6 +3201,7 @@ got_block:
 		}
 
 		if (buf_flush_page_try(buf_pool, fix_block)) {
+			guess = fix_block;
 			goto loop;
 		}