diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-03-17 01:26:58 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-03-17 01:26:58 -0700 |
| commit | 5d954e7cd0f9f4106d848a7d7fc8fbce35668785 (patch) | |
| tree | bd812fb49b473d759c5054fe89d12e4dc1e50a59 /sql/log_event.h | |
| parent | d110e0377dda1bb9f5a5c36745d3a6feb8e8a1d4 (diff) | |
| parent | 5338a28912589f1169b66b880a489ec5636bcd83 (diff) | |
| download | mariadb-git-5d954e7cd0f9f4106d848a7d7fc8fbce35668785.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 7866a7d7efa..de9cd65514c 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -3847,7 +3847,8 @@ protected: DBUG_ASSERT(m_table); ASSERT_OR_RETURN_ERROR(m_curr_row < m_rows_end, HA_ERR_CORRUPT_EVENT); - int const result= ::unpack_row(rli, m_table, m_width, m_curr_row, &m_cols, + int const result= ::unpack_row(rli, m_table, m_width, m_curr_row, + m_rows_end, &m_cols, &m_curr_row_end, &m_master_reclength); if (m_curr_row_end > m_rows_end) my_error(ER_SLAVE_CORRUPT_EVENT, MYF(0)); |