Merge branch 'mysql-8.0' into mysql-8.4

Change-Id: Ice34183ec1b871076ee8aecb6d79e90b8d8a9279

Author: frazerclement

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

@@ -35,7 +35,6 @@ Consume ops up to target
 Restart TC node
 Wait for not started state
 Check no operations from failed TC remain (must be none)
-select * from ndbinfo.cluster_operations where tc_node_id=2;;
 node_id	block_instance	transid	operation_type	state	tableid	fragmentid	client_node_id	client_block_ref	tc_node_id	tc_block_no	tc_block_instance
 Start TC node
 Wait for all started
@@ -62,7 +61,6 @@ Consume ops up to target
 Restart TC node
 Wait for not started state
 Check no operations from failed TC remain (must be none)
-select * from ndbinfo.cluster_operations where tc_node_id=1;;
 node_id	block_instance	transid	operation_type	state	tableid	fragmentid	client_node_id	client_block_ref	tc_node_id	tc_block_no	tc_block_instance
 Start TC node
 Wait for all started

mysql-test/suite/ndb/t/ndb_tctakeover2.test

@@ -80,7 +80,9 @@ while ($extra_pages < 2)
   exec $NDB_WAITER --not-started -w $tcnode >> $NDB_TOOLS_OUTPUT;
 
   --echo Check no operations from failed TC remain (must be none)
+  --disable_query_log
   --eval select * from ndbinfo.cluster_operations where tc_node_id=$tcnode;
+  --enable_query_log
 
   --echo Start TC node
   exec $NDB_MGM -e "$tcnode start" >> $NDB_TOOLS_OUTPUT;