diff options
| author | unknown <aelkin/andrei@mysql1000.(none)> | 2008-01-31 17:02:29 +0200 |
|---|---|---|
| committer | unknown <aelkin/andrei@mysql1000.(none)> | 2008-01-31 17:02:29 +0200 |
| commit | 64dbfdd7db718b0334e910892031f13ed5795a7b (patch) | |
| tree | 834bba98e1d4335161f7f522e8dabdb9c8a067b5 /sql/log_event.h | |
| parent | 6a873248d1d226b7610d2f3f0fa3c8d7e023ab87 (diff) | |
| parent | b6ec38cecc0285e8939e7b25aa5c63bada070974 (diff) | |
| download | mariadb-git-64dbfdd7db718b0334e910892031f13ed5795a7b.tar.gz | |
Merge mysql1000.(none):/mnt/nb/home/elkin/MySQL/TEAM/FIXES/5.1/bug32971-error_propag_slave
into mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug32971-rbr_error_prop
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
manual merge use local
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
manual merge use local
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index efb8675780e..e0f7a0517c4 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -3131,6 +3131,8 @@ protected: 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, &m_curr_row_end, &m_master_reclength); + if (m_curr_row_end > m_rows_end) + my_error(ER_SLAVE_CORRUPT_EVENT, MYF(0)); ASSERT_OR_RETURN_ERROR(m_curr_row_end <= m_rows_end, HA_ERR_CORRUPT_EVENT); return result; } |