Skip to content

M
mariadb
Commit 2a9d6a0c authored by unknown's avatar unknown
Browse files
Options

The assert fixed.

parent 266fde77
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
storage/maria/ma_loghandler.c
View file @ 2a9d6a0c
...@@ -1974,8 +1974,8 @@ static my_bool translog_buffer_next(TRANSLOG_ADDRESS *horizon, ...@@ -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) ...@@ -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() ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7