Correct a merge error

dr-m · dr-m · commit 6439238c5395 · 2017-06-06T14:57:20.000+03:00
diff --git a/storage/xtradb/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc
@@ -3450,6 +3450,7 @@ buf_page_get_gen(
 		}
 
 		if (buf_flush_page_try(buf_pool, fix_block)) {
+			guess = fix_block;
 			goto loop;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -3450,6 +3450,7 @@ buf_page_get_gen(`
`3450`	`3450`	`}`
`3451`	`3451`
`3452`	`3452`	`if (buf_flush_page_try(buf_pool, fix_block)) {`
	`3453`	`+ guess = fix_block;`
`3453`	`3454`	`goto loop;`
`3454`	`3455`	`}`
`3455`	`3456`