Merge 8.0 -> trunk

Author: blaudden

storage/ndb/plugin/ha_ndbcluster_binlog.cc

@@ -5670,6 +5670,7 @@ bool ndbcluster_binlog_check_table_async(const std::string &db_name,
     // Never check util tables which are managed by the Ndb_binlog_thread
     // NOTE! The other tables are filtered elsewhere but ndb_apply_status is
     // special since it's not hidden.
+    assert(false);
     return false;
   }
 

storage/ndb/plugin/ndb_metadata_change_monitor.cc

@@ -291,6 +291,13 @@ bool Ndb_metadata_change_monitor::detect_table_changes_in_schema(
     return false;
   }
 
+  // Remove NDB utility table mysql.ndb_apply_status, it's managed
+  // by the binlog thread but not marked as hidden in DD. It's masked in similar
+  // way from the list of tables in NDB.
+  if (schema_name == "mysql") {
+    ndb_tables_in_DD.erase("ndb_apply_status");
+  }
+
   // Special case when all NDB tables belonging to a schema still exist in DD
   // but not in NDB
   if (ndb_tables_in_NDB.empty() && !ndb_tables_in_DD.empty()) {