database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-9560 Mariadb 10.1 Crashes when replicating from 10.0

Browse Source 
don't crash in debug builds. issue an error message on corrupt event
This commit is contained in:
Sergei Golubchik
2016-02-18 21:43:19 +01:00
parent 96a7e74ed3
commit e69c6e81a8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/log_event.cc
View File

@ -11394,7 +11394,10 @@ Rows_log_event::write_row(rpl_group_info *rgi,
/* unpack row into table->record[0] */ /* unpack row into table->record[0] */
if ((error= unpack_current_row(rgi))) if ((error= unpack_current_row(rgi)))
{
table->file->print_error(error, MYF(0));
DBUG_RETURN(error); DBUG_RETURN(error);
}
if (m_curr_row == m_rows_buf && !invoke_triggers) if (m_curr_row == m_rows_buf && !invoke_triggers)
{ {
@ -12453,8 +12456,8 @@ Update_rows_log_event::do_exec_row(rpl_group_info *rgi)
We need to read the second image in the event of error to be We need to read the second image in the event of error to be
able to skip to the next pair of updates able to skip to the next pair of updates
*/ */
m_curr_row= m_curr_row_end; if ((m_curr_row= m_curr_row_end))
unpack_current_row(rgi); unpack_current_row(rgi);
return error; return error;
} }

4
sql/rpl_record.cc
View File

@ -185,7 +185,7 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
@retval HA_ERR_GENERIC @retval HA_ERR_GENERIC
A generic, internal, error caused the unpacking to fail. A generic, internal, error caused the unpacking to fail.
@retval ER_SLAVE_CORRUPT_EVENT @retval HA_ERR_CORRUPT_EVENT
Found error when trying to unpack fields. Found error when trying to unpack fields.
*/ */
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
@ -322,7 +322,7 @@ unpack_row(rpl_group_info *rgi,
"Could not read field '%s' of table '%s.%s'", "Could not read field '%s' of table '%s.%s'",
f->field_name, table->s->db.str, f->field_name, table->s->db.str,
table->s->table_name.str); table->s->table_name.str);
DBUG_RETURN(ER_SLAVE_CORRUPT_EVENT); DBUG_RETURN(HA_ERR_CORRUPT_EVENT);
} }
} }