Skip to content

Commit e5019d3

Browse files
author
Jan Lindström
committed
MDEV-10908: innodb_zip.bug56680 fails in buildbot with InnoDB: Failing assertion: bpage->id.space() == page_id.space()
Incorrect merge introduced too strict assertion.
1 parent 737295c commit e5019d3

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

storage/innobase/buf/buf0rea.cc

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2015. MariaDB Corporation.
4+
Copyright (c) 2015, 2016 MariaDB Corporation.
55
66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -180,17 +180,10 @@ buf_read_page_low(
180180

181181
IORequest request(type | IORequest::READ);
182182

183-
ut_ad(dst != NULL);
184-
ut_ad(bpage->zip.data != NULL || ((buf_block_t*)bpage)->frame != NULL);
185-
186183
*err = fil_io(
187184
request, sync, page_id, page_size, 0, page_size.physical(),
188185
dst, bpage, NULL);
189186

190-
ut_ad(dst != NULL);
191-
ut_ad(bpage->zip.data != NULL || ((buf_block_t*)bpage)->frame != NULL);
192-
ut_ad(bpage->id.space() == page_id.space());
193-
194187
if (sync) {
195188
thd_wait_end(NULL);
196189
}
@@ -218,8 +211,6 @@ buf_read_page_low(
218211
}
219212

220213
if (sync) {
221-
ut_ad(dst != NULL);
222-
ut_ad(bpage->zip.data != NULL || ((buf_block_t*)bpage)->frame != NULL);
223214
/* The i/o is already completed when we arrive from
224215
fil_read */
225216

0 commit comments

Comments
 (0)