rr_trx: fix syntax; disable in MTR

Author: dbentley-vsql

mysql-test/collections/disabled.def

@@ -125,3 +125,25 @@ group_replication.gr_xa_commit_failure_before_gtid_externalization @windows : BU
 group_replication.gr_xa_commit_one_phase_failure_before_gtid_externalization @windows : BUG#34155238 Disabled until bug is fixed
 group_replication.gr_xa_prepare_failure_before_gtid_externalization @windows : BUG#34155238 Disabled until bug is fixed
 group_replication.gr_xa_rollback_failure_before_gtid_externalization @windows : BUG#34155238 Disabled until bug is fixed
+
+# engines/rr_trx suite: This is a stress test suite designed to run via
+# run_stress_tx_rr.pl, not as standalone MTR tests. The init test creates
+# shared schema that rr_* tests depend on, but normal MTR restarts the
+# server between tests. Also broken upstream in Oracle MySQL 8.4.8
+# (ROWS became a reserved keyword in stored procedure parameters).
+engines/rr_trx.init_innodb : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_c_count_not_zero : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_c_stats : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_i_40-44 : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_id_3 : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_id_900 : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_insert_select_2 : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_iud_rollback-multi-50 : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_replace_7-8 : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_s_select-uncommitted : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_sc_select-limit-nolimit_4 : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_sc_select-same_2 : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_sc_sum_total : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_u_10-19 : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_u_10-19_nolimit : BUG#0 Stress-only suite, not standalone MTR tests
+engines/rr_trx.rr_u_4 : BUG#0 Stress-only suite, not standalone MTR tests

mysql-test/suite/engines/rr_trx/include/rr_init.test

@@ -81,24 +81,24 @@ CREATE TABLE t1 (
 # Check that the table was really created with the intended storage engine.
 SHOW CREATE TABLE t1;
 
-## Procedure for inserting the value 1000 into integer fieds, "rows" times.
+## Procedure for inserting the value 1000 into integer fieds, "num_rows" times.
 
 --delimiter //
 
-eval CREATE PROCEDURE insertRows(rows INT)
+eval CREATE PROCEDURE insertRows(num_rows INT)
 BEGIN
   SET @n = 1;
   REPEAT
-    INSERT INTO t1 (`id`, `int1`, `int1_key`, `int1_unique`, 
+    INSERT INTO t1 (`id`, `int1`, `int1_key`, `int1_unique`,
                     `int2`, `int2_key`, `int2_unique`,
-                    `for_update`, `connection_id`, `thread_id`, 
-                    `is_uncommitted`, `is_consistent`) 
+                    `for_update`, `connection_id`, `thread_id`,
+                    `is_uncommitted`, `is_consistent`)
        VALUES (0, 1000, 1000, @n,
                -1000, -1000, -@n,
-               0, CONNECTION_ID(), 0, 
+               0, CONNECTION_ID(), 0,
                0, 1);
     SET @n = @n + 1;
-  UNTIL @n > rows
+  UNTIL @n > num_rows
   END REPEAT;
 END;
 //

mysql-test/suite/engines/rr_trx/r/init_innodb.result

@@ -2,9 +2,9 @@ SET @@default_storage_engine = 'InnoDB';
 SHOW VARIABLES LIKE 'default_storage_engine';
 Variable_name	Value
 default_storage_engine	InnoDB
-SHOW VARIABLES LIKE 'tx_isolation';
+SHOW VARIABLES LIKE 'transaction_isolation';
 Variable_name	Value
-tx_isolation	REPEATABLE-READ
+transaction_isolation	REPEATABLE-READ
 CREATE TABLE statistics (
 tx_errors INTEGER NOT NULL
 );
@@ -34,18 +34,18 @@ PRIMARY KEY (`pk`)
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `pk` int(11) NOT NULL AUTO_INCREMENT,
-  `id` int(11) NOT NULL,
-  `int1` int(11) DEFAULT NULL,
-  `int1_key` int(11) DEFAULT NULL,
-  `int1_unique` int(11) DEFAULT NULL,
-  `int2` int(11) DEFAULT NULL,
-  `int2_key` int(11) DEFAULT NULL,
-  `int2_unique` int(11) DEFAULT NULL,
+  `pk` int NOT NULL AUTO_INCREMENT,
+  `id` int NOT NULL,
+  `int1` int DEFAULT NULL,
+  `int1_key` int DEFAULT NULL,
+  `int1_unique` int DEFAULT NULL,
+  `int2` int DEFAULT NULL,
+  `int2_key` int DEFAULT NULL,
+  `int2_unique` int DEFAULT NULL,
   `for_update` tinyint(1) DEFAULT '0',
-  `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `connection_id` int(11) DEFAULT NULL,
-  `thread_id` int(11) DEFAULT '0',
+  `timestamp` timestamp NULL DEFAULT NULL,
+  `connection_id` int DEFAULT NULL,
+  `thread_id` int DEFAULT '0',
   `is_uncommitted` tinyint(1) DEFAULT '0',
   `is_consistent` tinyint(1) DEFAULT '0',
   PRIMARY KEY (`pk`),
@@ -54,21 +54,21 @@ t1	CREATE TABLE `t1` (
   KEY `id` (`id`),
   KEY `int1_key` (`int1_key`),
   KEY `int2_key` (`int2_key`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
-CREATE PROCEDURE insertRows(rows INT)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+CREATE PROCEDURE insertRows(num_rows INT)
 BEGIN
 SET @n = 1;
 REPEAT
-INSERT INTO t1 (`id`, `int1`, `int1_key`, `int1_unique`, 
+INSERT INTO t1 (`id`, `int1`, `int1_key`, `int1_unique`,
 `int2`, `int2_key`, `int2_unique`,
-`for_update`, `connection_id`, `thread_id`, 
-`is_uncommitted`, `is_consistent`) 
+`for_update`, `connection_id`, `thread_id`,
+`is_uncommitted`, `is_consistent`)
 VALUES (0, 1000, 1000, @n,
 -1000, -1000, -@n,
-0, CONNECTION_ID(), 0, 
+0, CONNECTION_ID(), 0,
 0, 1);
 SET @n = @n + 1;
-UNTIL @n > rows
+UNTIL @n > num_rows
 END REPEAT;
 END;
 //