diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-09 13:44:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-09 13:44:04 +0300 |
| commit | a9117c90083d3f26e43c460073e06f9562b66f44 (patch) | |
| tree | 51235d556ac3eb92b5e2d42ffbe1dc289fb70870 /storage/xtradb/buf | |
| parent | d03abc71a490f4ee6d173d07c95a2adb9c60457c (diff) | |
| download | mariadb-git-a9117c90083d3f26e43c460073e06f9562b66f44.tar.gz | |
Correct a merge error of MDEV-11626
Diffstat (limited to 'storage/xtradb/buf')
| -rw-r--r-- | storage/xtradb/buf/buf0buf.cc | 1 |
1 files changed, 1 insertions, 0 deletions
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; } |