1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The assert fixed.

Browse Source
This commit is contained in:
unknown 2008-01-11 14:05:11 +02:00
parent 266fde77b2
commit 2a9d6a0c00
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
storage/maria/ma_loghandler.c
View File

@ -1974,8 +1974,8 @@ static my_bool translog_buffer_next(TRANSLOG_ADDRESS *horizon,
translog_wait_for_buffer_free(new_buffer); translog_wait_for_buffer_free(new_buffer);
#ifndef DBUG_OFF #ifndef DBUG_OFF
/* We keep the handler locked so nobody can start this new buffer */ /* We keep the handler locked so nobody can start this new buffer */
DBUG_ASSERT(offset == new_buffer->offset && file == new_buffer->file && DBUG_ASSERT(offset == new_buffer->offset && new_buffer->file == NULL &&
ver == new_buffer->ver); (file == NULL ? ver : (uint8)(ver + 1)) == new_buffer->ver);
} }
#endif #endif
} }
@ -4348,8 +4348,8 @@ static my_bool translog_advance_pointer(int pages, uint16 last_page_data)
translog_wait_for_buffer_free(new_buffer); translog_wait_for_buffer_free(new_buffer);
#ifndef DBUG_OFF #ifndef DBUG_OFF
/* We keep the handler locked so nobody can start this new buffer */ /* We keep the handler locked so nobody can start this new buffer */
DBUG_ASSERT(offset == new_buffer->offset && file == new_buffer->file && DBUG_ASSERT(offset == new_buffer->offset && new_buffer->file == NULL &&
ver == new_buffer->ver); (file == NULL ? ver : (uint8)(ver + 1)) == new_buffer->ver);
} }
#endif #endif
@ -7007,8 +7007,8 @@ static void translog_force_current_buffer_to_finish()
translog_wait_for_buffer_free(new_buffer); translog_wait_for_buffer_free(new_buffer);
#ifndef DBUG_OFF #ifndef DBUG_OFF
/* We keep the handler locked so nobody can start this new buffer */ /* We keep the handler locked so nobody can start this new buffer */
DBUG_ASSERT(offset == new_buffer->offset && file == new_buffer->file && DBUG_ASSERT(offset == new_buffer->offset && new_buffer->file == NULL &&
ver == new_buffer->ver); (file == NULL ? ver : (uint8)(ver + 1)) == new_buffer->ver);
} }
#endif #endif