revision-id: af1568668f6a910b5739fe1d7181c59f94a95196 parent(s): 1c288c266e0208e98d55e5348fa78c27517022c9 committer: Sergei Petrunia branch nick: 10.2-r12-new-submodule timestamp: 2018-07-05 16:04:05 +0300 message: MDEV-16242: MyRocks: parallel slave on a table without PK can stop with ER_KEY_NOT_FOUND DRAFT: If RBR event applier uses a secondary key or a full table scan to locate a row, force waiting for prior commit to complete. --- sql/log_event.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sql/log_event.cc b/sql/log_event.cc index 7de9df9..45d8532 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -13250,6 +13250,8 @@ int Rows_log_event::find_row(rpl_group_info *rgi) /* else fall through to index scan */ } } + // MyRocks: wait for prior commit before using non-unique index scan + thd->wait_for_prior_commit(); is_index_scan=true; @@ -13278,6 +13280,8 @@ int Rows_log_event::find_row(rpl_group_info *rgi) } else { + // MyRocks: wait for prior commit before using non-unique index scan + thd->wait_for_prior_commit(); DBUG_PRINT("info",("locating record using table scan (rnd_next)")); /* We use this to test that the correct key is used in test cases. */ DBUG_EXECUTE_IF("slave_crash_if_table_scan", abort(););