diff options
| author | unknown <guilhem@gbichot4.local> | 2007-07-30 12:01:52 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2007-07-30 12:01:52 +0200 |
| commit | 9554b40df2a2c1ad3be7b79cf8a5abe6ca4e211e (patch) | |
| tree | 41223debf9dcf6bc7a2a0c91658c5835b51b4cc5 /storage | |
| parent | 9b1e83dba732896f606181b21becc3b0144a91ec (diff) | |
| download | mariadb-git-9554b40df2a2c1ad3be7b79cf8a5abe6ca4e211e.tar.gz | |
Maria: it is allowed to change unknown type to any legal type of page
in the pagecache: fixing wrong assertion and a test case.
maria.test and ps_maria.test still fail.
mysql-test/r/maria.result:
result update
mysql-test/t/maria.test:
added test for incorrect assert on page's type
storage/maria/ma_pagecache.c:
It is allowed to change unknown type to any legal type of page in the
pagecache.
Diffstat (limited to 'storage')
| -rwxr-xr-x | storage/maria/ma_pagecache.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/maria/ma_pagecache.c b/storage/maria/ma_pagecache.c index 12e561c69bc..5c803b3dd83 100755 --- a/storage/maria/ma_pagecache.c +++ b/storage/maria/ma_pagecache.c @@ -2865,7 +2865,9 @@ restart: (pin == PAGECACHE_PIN)), &page_st); DBUG_ASSERT(block->type == PAGECACHE_EMPTY_PAGE || - block->type == type || type == PAGECACHE_READ_UNKNOWN_PAGE); + block->type == type || + type == PAGECACHE_READ_UNKNOWN_PAGE || + block->type == PAGECACHE_READ_UNKNOWN_PAGE); if (type != PAGECACHE_READ_UNKNOWN_PAGE || block->type == PAGECACHE_EMPTY_PAGE) block->type= type; |