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

MDEV-12756 rpl.rpl_killed_ddl fails in buildbot with 'Can't find record'

The issue was that my_errno was not set properly when a repair was killed,
which confused the rpl_killed_ddl script.

I also added an extra test line in varchar.inc to ensure we don't give
duplicate error rows.
This commit is contained in:
Monty
2017-05-17 00:00:27 +03:00
parent ca7cf69cb1
commit f7dab76aa2
11 changed files with 44 additions and 3 deletions

View File

@ -9938,7 +9938,9 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
}
if (to->file->ha_end_bulk_insert() && error <= 0)
{
to->file->print_error(my_errno,MYF(0));
/* Give error, if not already given */
if (!thd->is_error())
to->file->print_error(my_errno,MYF(0));
error= 1;
}
to->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);