BUG#35164090 NDB MTA fails to retry temporary error [unrelated fix]

Separate patch to adapt new(since 8.0.33) test by changing its config
to not allow transaction retries and then expect ER_LOCK_WAIT_TIMEOUT
rather than ER_ERROR_DURING_COMMIT.

Change-Id: Ib0945001855d4f41c956fbc433a8e9660ad9c0be

Author: blaudden

mysql-test/suite/ndb_rpl/r/mta_commit_sync2.result

@@ -41,6 +41,7 @@ Variable_name	Value
 replica_preserve_commit_order	ON
 # Supress MTA errors generated by test
 call mtr.add_suppression(".*Could not execute Write_rows event.*");
+call mtr.add_suppression(".*worker thread retried transaction 1 time.*");
 call mtr.add_suppression(".*possibly leaving data in inconsistent state.*");
 call mtr.add_suppression(".*worker has stopped after at least one previous worker encountered an error when replica-preserve-commit-order was enabled.*");
 include/start_slave.inc
@@ -114,7 +115,7 @@ SELECT WORKER_ID, LAST_ERROR_NUMBER
 FROM performance_schema.replication_applier_status_by_worker
 WHERE LAST_ERROR_NUMBER != 0;
 WORKER_ID	1
-LAST_ERROR_NUMBER	1180
+LAST_ERROR_NUMBER	1205
 WORKER_ID	2
 LAST_ERROR_NUMBER	3030
 # Show the coordinator error number and message

mysql-test/suite/ndb_rpl/t/mta_commit_sync2.cnf

@@ -9,4 +9,5 @@ replica-parallel-workers=10
 
 #disable-log-bin
 replica-preserve-commit-order=1
-log-replica-updates=1
+log-replica-updates=1
+replica_transaction_retries=1

mysql-test/suite/ndb_rpl/t/mta_commit_sync2.test

@@ -33,6 +33,7 @@ show variables like 'replica_preserve_commit_order';
 
 --echo # Supress MTA errors generated by test
 call mtr.add_suppression(".*Could not execute Write_rows event.*");
+call mtr.add_suppression(".*worker thread retried transaction 1 time.*");
 call mtr.add_suppression(".*possibly leaving data in inconsistent state.*");
 call mtr.add_suppression(".*worker has stopped after at least one previous worker encountered an error when replica-preserve-commit-order was enabled.*");