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

MDEV-9560 Mariadb 10.1 Crashes when replicating from 10.0

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

View File

@ -185,7 +185,7 @@ pack_row(TABLE *table, MY_BITMAP const* cols,
@retval HA_ERR_GENERIC
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.
*/
#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'",
f->field_name, table->s->db.str,
table->s->table_name.str);
DBUG_RETURN(ER_SLAVE_CORRUPT_EVENT);
DBUG_RETURN(HA_ERR_CORRUPT_EVENT);
}
}