diff --git a/include/my_base.h b/include/my_base.h
index a704ff1b6ab..b9a806cc02f 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -159,6 +159,8 @@ enum ha_extra_function {
     Ignore if the a tuple is not found, continue processing the
     transaction and ignore that 'row'.  Needed for idempotency
     handling on the slave
+
+    Currently only used by NDB storage engine. Partition handler ignores flag.
   */
   HA_EXTRA_IGNORE_NO_KEY,
   HA_EXTRA_NO_IGNORE_NO_KEY,
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 91f8c986cc4..1ab333eb37b 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -23,8 +23,8 @@ partition_03ndb         : Bug#16385
 ps_7ndb                 : dbug assert in RBR mode when executing test suite
 #rpl_bit_npk             : Bug#13418
 rpl_ddl                 : Bug#15963 SBR does not show "Definer" correctly
-rpl_ndb_2innodb         : Assert failure in ha_partition::extra()
-rpl_ndb_2myisam         : Assert failure in ha_partition::extra()
+rpl_ndb_2innodb         : If removed fails later on assertion in get_parts_for_update()
+rpl_ndb_2myisam         : If removed fails later on assertion in get_parts_for_update()
 rpl_ndb_auto_inc        : Bug#17086
 #rpl_ndb_basic           : Bug#16228 [IN REVIEW]
 rpl_ndb_blob            : interferes with following tests, causing hang