diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-09-07 19:58:39 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-09-07 19:58:39 +0300 |
| commit | 89e62085c699df26764e90e65def7679fd15d97c (patch) | |
| tree | 6c9931a0eabe600e10a622978876227c0712205e /storage/maria/ma_blockrec.c | |
| parent | 5288f8c02138051e371b10336d47d6df99d5aac2 (diff) | |
| download | mariadb-git-89e62085c699df26764e90e65def7679fd15d97c.tar.gz | |
Fixed recovery bug where bitmap pages would not be correctly updated after processing UNDO rows.
Fixed test failures in buildbot
Don't write errors when failing to send ok packet
mysql-test/suite/pbxt/r/range.result:
Don't write number of rows as it varies.
mysql-test/suite/pbxt/t/range.test:
Don't write number of rows as it varies.
sql/mysqld.cc:
Don't write errors when failing to send ok packet
storage/maria/ma_bitmap.c:
Added DBUG_ASSERT to detect wrong bitmap pages
storage/maria/ma_blockrec.c:
Don't reset BLOCKUSED_USE_ORG_BITMAP flag. This fixed a bug where bitmap could be wrong after UNDO of row with blobs
Diffstat (limited to 'storage/maria/ma_blockrec.c')
| -rw-r--r-- | storage/maria/ma_blockrec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c index 0779564c8af..f582bfb3b97 100644 --- a/storage/maria/ma_blockrec.c +++ b/storage/maria/ma_blockrec.c @@ -1990,7 +1990,8 @@ static my_bool write_tail(MARIA_HA *info, block->empty_space= (enough_free_entries(row_pos.buff, share->block_size, 1 + share->base.blobs) ? empty_space : 0); - block->used= BLOCKUSED_USED | BLOCKUSED_TAIL; + /* Keep BLOCKUSED_USE_ORG_BITMAP */ + block->used|= BLOCKUSED_USED | BLOCKUSED_TAIL; /* Increase data file size, if extended */ position= (my_off_t) block->page * block_size; |