diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-27 20:41:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-27 20:41:31 +0300 |
| commit | 4d59f45260547b3230f177498b6fa07a12647fdc (patch) | |
| tree | c39c6757a7a7ddbc4849769b288c0131da74803d /sql/log_event.cc | |
| parent | acf6f92aa936fbfe7524617ae57d011ab8f1f96d (diff) | |
| parent | 00377147e3029b982cbc29d3f4477362c6e6fdb4 (diff) | |
| download | mariadb-git-4d59f45260547b3230f177498b6fa07a12647fdc.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 28ac34c8a0f..52556cddd12 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -13477,6 +13477,12 @@ Rows_log_event::write_row(rpl_group_info *rgi, if (table->file->ha_table_flags() & HA_DUPLICATE_POS) { DBUG_PRINT("info",("Locating offending record using rnd_pos()")); + + if ((error= table->file->ha_rnd_init_with_error(0))) + { + DBUG_RETURN(error); + } + error= table->file->ha_rnd_pos(table->record[1], table->file->dup_ref); if (unlikely(error)) { @@ -13484,6 +13490,7 @@ Rows_log_event::write_row(rpl_group_info *rgi, table->file->print_error(error, MYF(0)); DBUG_RETURN(error); } + table->file->ha_rnd_end(); } else { |