diff options
| author | unknown <bell@desktop.sanja.is.com.ua> | 2008-01-11 14:05:11 +0200 |
|---|---|---|
| committer | unknown <bell@desktop.sanja.is.com.ua> | 2008-01-11 14:05:11 +0200 |
| commit | 2a9d6a0c005cbd129d926ac5017d104c1baf2016 (patch) | |
| tree | 883c24ac7fdb9ac5afa8a91e527658839b2cfe90 | |
| parent | 266fde77b283237fa2dd6db0f97fb68289fe0c21 (diff) | |
| download | mariadb-git-2a9d6a0c005cbd129d926ac5017d104c1baf2016.tar.gz | |
The assert fixed.
| -rw-r--r-- | storage/maria/ma_loghandler.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 4f6c18583da..0298f1bdeed 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -1974,8 +1974,8 @@ static my_bool translog_buffer_next(TRANSLOG_ADDRESS *horizon, translog_wait_for_buffer_free(new_buffer); #ifndef DBUG_OFF /* We keep the handler locked so nobody can start this new buffer */ - DBUG_ASSERT(offset == new_buffer->offset && file == new_buffer->file && - ver == new_buffer->ver); + DBUG_ASSERT(offset == new_buffer->offset && new_buffer->file == NULL && + (file == NULL ? ver : (uint8)(ver + 1)) == new_buffer->ver); } #endif } @@ -4348,8 +4348,8 @@ static my_bool translog_advance_pointer(int pages, uint16 last_page_data) translog_wait_for_buffer_free(new_buffer); #ifndef DBUG_OFF /* We keep the handler locked so nobody can start this new buffer */ - DBUG_ASSERT(offset == new_buffer->offset && file == new_buffer->file && - ver == new_buffer->ver); + DBUG_ASSERT(offset == new_buffer->offset && new_buffer->file == NULL && + (file == NULL ? ver : (uint8)(ver + 1)) == new_buffer->ver); } #endif @@ -7007,8 +7007,8 @@ static void translog_force_current_buffer_to_finish() translog_wait_for_buffer_free(new_buffer); #ifndef DBUG_OFF /* We keep the handler locked so nobody can start this new buffer */ - DBUG_ASSERT(offset == new_buffer->offset && file == new_buffer->file && - ver == new_buffer->ver); + DBUG_ASSERT(offset == new_buffer->offset && new_buffer->file == NULL && + (file == NULL ? ver : (uint8)(ver + 1)) == new_buffer->ver); } #endif |