diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 15:28:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-26 15:28:07 +0100 |
| commit | 0dc23679c867629ded5f9534d2ab6e8edf238aa0 (patch) | |
| tree | 9cf966507fa2ef0fd17932b600d051df5f7bd2e5 /sql/log_event_old.h | |
| parent | 6efa5efa7dd112b6ac2efdd84235a13cca51c4d4 (diff) | |
| parent | 0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2 (diff) | |
| download | mariadb-git-0dc23679c867629ded5f9534d2ab6e8edf238aa0.tar.gz | |
10.0-base merge
Diffstat (limited to 'sql/log_event_old.h')
| -rw-r--r-- | sql/log_event_old.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/log_event_old.h b/sql/log_event_old.h index 97fc24a1bef..7408e121f96 100644 --- a/sql/log_event_old.h +++ b/sql/log_event_old.h @@ -1,4 +1,4 @@ -/* Copyright 2007 MySQL AB. +/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -207,11 +207,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(rgi, m_table, m_width, m_curr_row, - m_rows_end, &m_cols, - &m_curr_row_end, &m_master_reclength); - ASSERT_OR_RETURN_ERROR(m_curr_row_end <= m_rows_end, HA_ERR_CORRUPT_EVENT); - return result; + return ::unpack_row(rgi, m_table, m_width, m_curr_row, &m_cols, + &m_curr_row_end, &m_master_reclength, m_rows_end); } #endif |