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_old.cc | |
| parent | d110e0377dda1bb9f5a5c36745d3a6feb8e8a1d4 (diff) | |
| parent | 5338a28912589f1169b66b880a489ec5636bcd83 (diff) | |
| download | mariadb-git-5d954e7cd0f9f4106d848a7d7fc8fbce35668785.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'sql/log_event_old.cc')
| -rw-r--r-- | sql/log_event_old.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 09a58e29c18..104a77c65a7 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -975,7 +975,8 @@ Write_rows_log_event_old::do_prepare_row(THD *thd_arg, int error; error= unpack_row_old(const_cast<Relay_log_info*>(rli), table, m_width, table->record[0], - row_start, &m_cols, row_end, &m_master_reclength, + row_start, m_rows_end, + &m_cols, row_end, &m_master_reclength, table->write_set, PRE_GA_WRITE_ROWS_EVENT); bitmap_copy(table->read_set, table->write_set); return error; @@ -1062,7 +1063,8 @@ Delete_rows_log_event_old::do_prepare_row(THD *thd_arg, error= unpack_row_old(const_cast<Relay_log_info*>(rli), table, m_width, table->record[0], - row_start, &m_cols, row_end, &m_master_reclength, + row_start, m_rows_end, + &m_cols, row_end, &m_master_reclength, table->read_set, PRE_GA_DELETE_ROWS_EVENT); /* If we will access rows using the random access method, m_key will @@ -1161,13 +1163,15 @@ int Update_rows_log_event_old::do_prepare_row(THD *thd_arg, /* record[0] is the before image for the update */ error= unpack_row_old(const_cast<Relay_log_info*>(rli), table, m_width, table->record[0], - row_start, &m_cols, row_end, &m_master_reclength, + row_start, m_rows_end, + &m_cols, row_end, &m_master_reclength, table->read_set, PRE_GA_UPDATE_ROWS_EVENT); row_start = *row_end; /* m_after_image is the after image for the update */ error= unpack_row_old(const_cast<Relay_log_info*>(rli), table, m_width, m_after_image, - row_start, &m_cols, row_end, &m_master_reclength, + row_start, m_rows_end, + &m_cols, row_end, &m_master_reclength, table->write_set, PRE_GA_UPDATE_ROWS_EVENT); DBUG_DUMP("record[0]", table->record[0], table->s->reclength); |