MDEV-30804 addendum for 10.6+ branches

This addition to MDEV-30804 is relevant for 10.6+, it excludes
the mixed transaction section using both innodb and aria storage
engines from the galera_var_replicate_aria_off test, since such
transactions cannot be executed unless aria supports two-phase
transaction commit. No additional tests are required as this
commit fixes the mtr test itself.

mysql-test/suite/galera/r/galera_var_replicate_aria_on.result

@@ -89,11 +89,8 @@ connection node_1;
 SET GLOBAL wsrep_sync_wait=15;
 CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=Aria;
 CREATE TABLE t2 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
 INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (1);
-COMMIT;
 connection node_2;
 SET GLOBAL wsrep_sync_wait=15;
 SELECT COUNT(*) AS EXPECT_1 FROM t1;
@@ -103,6 +100,7 @@ SELECT COUNT(*) AS EXPECT_1 FROM t2;
 EXPECT_1
 1
 connection node_1;
+SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES (2);
 INSERT INTO t2 VALUES (2);
@@ -129,6 +127,7 @@ INSERT INTO t1 VALUES (1);
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
 connection node_1;
 COMMIT;
+ERROR HY000: Transactional commit not supported by involved engine(s)
 DROP TABLE t1,t2;
 connection node_1;
 CREATE TABLE t1 (i INT NOT NULL PRIMARY KEY) ENGINE=INNODB;

mysql-test/suite/galera/t/galera_var_replicate_aria_on.test

@@ -85,18 +85,15 @@ SELECT * FROM t1;
 DROP TABLE t1;
 
 #
-# Transaction
+# Preparation for next tests
 #
 
 --connection node_1
 SET GLOBAL wsrep_sync_wait=15;
 CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=Aria;
 CREATE TABLE t2 (f1 INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
-SET AUTOCOMMIT=OFF;
-START TRANSACTION;
 INSERT INTO t1 VALUES (1);
 INSERT INTO t2 VALUES (1);
-COMMIT;
 
 --connection node_2
 SET GLOBAL wsrep_sync_wait=15;
@@ -108,6 +105,7 @@ SELECT COUNT(*) AS EXPECT_1 FROM t2;
 #
 
 --connection node_1
+SET AUTOCOMMIT=OFF;
 START TRANSACTION;
 INSERT INTO t1 VALUES (2);
 INSERT INTO t2 VALUES (2);
@@ -138,6 +136,8 @@ INSERT INTO t2 VALUES (1);
 INSERT INTO t1 VALUES (1);
 
 --connection node_1
+
+--error ER_ERROR_DURING_COMMIT
 COMMIT;
 
 DROP TABLE t1,t2;