diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-17 11:00:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-17 11:00:51 +0100 |
| commit | 84651126c0f101ea762eec0eb4045f533a00e96d (patch) | |
| tree | 1bba1d0079b08cb10fe69e03942cd5f254dc735e /sql/log_event_old.h | |
| parent | 1fa5183241e5a8e8e91690f0c35d676e9f3334ca (diff) | |
| parent | f7c8dd6bc7bb6d46d1ae2b6fdb47227429387e33 (diff) | |
| download | mariadb-git-84651126c0f101ea762eec0eb4045f533a00e96d.tar.gz | |
MySQL-5.5.36 merge
(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
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 0034bb9d142..d9d9f25737b 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 @@ -203,11 +203,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_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(rli, m_table, m_width, m_curr_row, &m_cols, + &m_curr_row_end, &m_master_reclength, m_rows_end); } #endif |