Merge branch 'mysql-5.6-cluster-7.4' into mysql-5.7-cluster-7.5

Author: Martin Sköld

mysql-test/suite/ndb/r/ndb_basic.result

@@ -142,6 +142,7 @@ ndb_log_binlog_index	#
 ndb_log_empty_epochs	#
 ndb_log_empty_update	#
 ndb_log_exclusive_reads	#
+ndb_log_fail_terminate	#
 ndb_log_orig	#
 ndb_log_transaction_id	#
 ndb_log_update_as_write	#