From 4534e5b4dc4668d6e1f96b9160c6209f356efca9 Mon Sep 17 00:00:00 2001
From: Rene Cannao <rene@proxysql.com>
Date: Thu, 16 Apr 2026 05:17:35 +0000
Subject: [PATCH] feat(tests): merge legacy-g[1-5] test sets into
 mysql{84,90,95}-g[1-5]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Every TAP test in legacy-gN is now also a member of mysql84-gN,
mysql90-gN, and mysql95-gN (N=1..5). No tests removed from any group;
legacy-g[1-5] keeps its existing membership intact.

Rationale: the legacy group covers the MySQL 5.7 / MariaDB 10 / PgSQL /
ClickHouse matrix, but many of its TAP tests are not inherently tied to
MySQL 5.7 — they exercise ProxySQL behavior that should also hold
against modern MySQL backends (8.4, 9.0, 9.5). Running them against
those newer servers widens the matrix and catches 9.x-specific
regressions in tests that weren't previously in a 9.x group.

Mechanical merge via a walk over groups.json:
  for each test:
      for N in 1..5:
          if 'legacy-gN' in memberships:
              add 'mysql84-gN', 'mysql90-gN', 'mysql95-gN' if absent

224 new memberships added. Per-bucket union size (i.e. now a superset
of legacy-gN):

  g1:  legacy=87   mysql84=93  mysql90=87  mysql95=93
  g2:  legacy=43   mysql84=45  mysql90=45  mysql95=45
  g3:  legacy=40   mysql84=40  mysql90=40  mysql95=40
  g4:  legacy=94   mysql84=96  mysql90=96  mysql95=96
  g5:  legacy=5    mysql84=7   mysql90=7   mysql95=7

Verified as supersets (every test in legacy-gN is present in
mysql{84,90,95}-gN). check_groups.py reports 385/385 tests registered,
no orphans.

Expect new 9.x-specific failures to surface when the mysql{90,95}-g*
groups run these newly-inherited legacy tests — they're likely to hit
the same family of mysql_native_password / caching_sha2_password issues
we've already been working through in the sibling PR threads. Those
will be triaged as they appear.
---
 test/tap/groups/groups.json | 336 ++++++++++++++++++++++++++++++------
 1 file changed, 280 insertions(+), 56 deletions(-)

diff --git a/test/tap/groups/groups.json b/test/tap/groups/groups.json
index e3518d08e..f7910a644 100644
--- a/test/tap/groups/groups.json
+++ b/test/tap/groups/groups.json
@@ -200,6 +200,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "clickhouse_php_conn-t": [
@@ -507,6 +508,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mcp_mixed_mysql_pgsql_concurrency_stress-t": [
@@ -571,6 +573,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-fast_forward-t": [
@@ -580,6 +583,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-init_connect-1-t": [
@@ -646,6 +650,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-protocol_compression_level-t": [
@@ -655,6 +660,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-reg_test_4707_threshold_resultset_size-t": [
@@ -664,6 +670,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-reg_test_4716_single_semicolon-t": [
@@ -673,6 +680,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-reg_test_4723_query_cache_stores_empty_result-t": [
@@ -682,6 +690,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-reg_test_4867_query_rules-t": [
@@ -691,6 +700,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-select_version_without_backend-t": [
@@ -700,6 +710,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-set_transaction-t": [
@@ -709,6 +720,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-set_wait_timeout-t": [
@@ -738,6 +750,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-test_malformed_packet-t": [
@@ -747,6 +760,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-test_ssl_CA-t": [
@@ -756,6 +770,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql-watchdog_test-t": [
@@ -781,6 +796,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql_hostgroup_attributes_config_file-t": [
@@ -790,6 +806,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql_query_logging_memory-t": [
@@ -799,6 +816,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql_reconnect_libmariadb-t": [
@@ -808,6 +826,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql_reconnect_libmysql-t": [
@@ -817,6 +836,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql_resolution_unit-t": [
@@ -829,6 +849,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "mysql_stmt_send_long_data_large-t": [
@@ -838,6 +859,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "nl2sql_integration-t": [
@@ -875,147 +897,210 @@
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-admin_metacmds_describe_all_tables-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-admin_metacmds_describe_queries-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-basic_tests-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-connection_parameters_test-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-copy_from_stdin_session_parameter-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-copy_from_test-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-copy_to_test-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-extended_query_protocol_query_rules_test-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-extended_query_protocol_test-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-issue5384-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-monitor_ssl_connections_test-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-multiplex_status_test-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-notice_test-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-options_startup_params-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-parameterized_kill_queries_test-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-proxysql_cmd_test-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-query_cache_soft_ttl_pct-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-query_cache_test-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-query_cancel_session_termination_test-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-query_digests_stages_test-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-query_rules_routing-t": [
     "pgsql17-repl-g4"
@@ -1025,126 +1110,180 @@
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-reg_test_4716_single_semicolon-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-reg_test_4867_query_rules-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-reg_test_5140_bind_param_fmt_mix-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-reg_test_5273_bind_parameter_format-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-reg_test_5284_frontend_ssl_enforcement-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-reg_test_5300_threshold_resultset_deadlock-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-reg_test_5352_prepared_statement_refcount_race-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-reg_test_5415_copy_error_recovery-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-servers_ssl_params-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-set_parameter_validation_test-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-set_statement_test-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-ssl_keylog-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-test_malformed_packet-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-transaction_state_comprehensive-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-transaction_variable_state_tracking-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql-unsupported_feature_test-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql-watchdog_test-t": [
     "legacy-g4",
     "mysql-auto_increment_delay_multiplex=0-g4",
     "mysql-multiplexing=false-g4",
     "mysql-query_digests=0-g4",
-    "mysql-query_digests_keep_comment=1-g4"
+    "mysql-query_digests_keep_comment=1-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "pgsql_command_complete_unit-t": [
     "unit-tests-g1"
@@ -1163,14 +1302,20 @@
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql_query_logging_memory-t": [
     "legacy-g1",
     "mysql-auto_increment_delay_multiplex=0-g1",
     "mysql-multiplexing=false-g1",
     "mysql-query_digests=0-g1",
-    "mysql-query_digests_keep_comment=1-g1"
+    "mysql-query_digests_keep_comment=1-g1",
+    "mysql84-g1",
+    "mysql90-g1",
+    "mysql95-g1"
   ],
   "pgsql_servers_ssl_params_unit-t": [
     "unit-tests-g1"
@@ -1191,6 +1336,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "prepare_statement_err3024_async-t": [
@@ -1200,6 +1346,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "prepare_statement_err3024_libmysql-t": [
@@ -1209,6 +1356,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "protocol_unit-t": [
@@ -1236,6 +1384,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_1574-mariadb_read_stmt_execute_response-t": [
@@ -1245,6 +1394,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_1574-stmt_metadata-t": [
@@ -1254,6 +1404,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_2233_mirror_fast_routing-t": [
@@ -1263,6 +1414,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_2793-compression-t": [
@@ -1272,6 +1424,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3184-set_wait_timeout-t": [
@@ -1281,6 +1434,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3223-restapi_return_codes-t": [
@@ -1290,6 +1444,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3247-mycli_support-t": [
@@ -1299,6 +1454,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3273_ssl_con-t": [
@@ -1308,6 +1464,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3317-lock_hostgroup_special_queries-t": [
@@ -1317,6 +1474,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3327-process_query_set_status_flags-t": [
@@ -1326,6 +1484,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3371_prepared_statement_crash-t": [
@@ -1335,6 +1494,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3427-stmt_first_comment1-param-t": [
@@ -1344,6 +1504,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3427-stmt_first_comment1-t": [
@@ -1353,6 +1514,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3427-stmt_first_comment2-param-t": [
@@ -1362,6 +1524,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3427-stmt_first_comment2-t": [
@@ -1371,6 +1534,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3434-text_stmt_mix-t": [
@@ -1380,6 +1544,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3493-USE_with_comment-t": [
@@ -1389,6 +1554,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3504-change_user-t": [
@@ -1398,6 +1564,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3546-stmt_empty_params-t": [
@@ -1407,6 +1574,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3549-autocommit_tracking-t": [
@@ -1416,6 +1584,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3585-stmt_metadata-t": [
@@ -1425,6 +1594,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3591-restapi_num_fds-t": [
@@ -1434,6 +1604,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3603-stmt_metadata-t": [
@@ -1443,6 +1614,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3606-mysql_warnings-t": [
@@ -1452,6 +1624,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3625-sqlite3_session_client_error_limit-t": [
@@ -1461,6 +1634,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3690-admin_large_pkts-t": [
@@ -1470,6 +1644,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_3765_ssl_pollout-t": [
@@ -1479,8 +1654,11 @@
     "mysql-query_digests=0-g2",
     "mysql-query_digests_keep_comment=1-g2",
     "mysql84-g2",
+    "mysql84-g4",
     "mysql90-g2",
-    "mysql95-g2"
+    "mysql90-g4",
+    "mysql95-g2",
+    "mysql95-g4"
   ],
   "reg_test_3838-restapi_eintr-t": [
     "legacy-g2",
@@ -1507,21 +1685,30 @@
     "mysql-auto_increment_delay_multiplex=0-g2",
     "mysql-multiplexing=false-g2",
     "mysql-query_digests=0-g2",
-    "mysql-query_digests_keep_comment=1-g2"
+    "mysql-query_digests_keep_comment=1-g2",
+    "mysql84-g2",
+    "mysql90-g2",
+    "mysql95-g2"
   ],
   "reg_test_3992_fast_forward_malformed_packet-pymysql-t": [
     "legacy-g2",
     "mysql-auto_increment_delay_multiplex=0-g2",
     "mysql-multiplexing=false-g2",
     "mysql-query_digests=0-g2",
-    "mysql-query_digests_keep_comment=1-g2"
+    "mysql-query_digests_keep_comment=1-g2",
+    "mysql84-g2",
+    "mysql90-g2",
+    "mysql95-g2"
   ],
   "reg_test_3992_fast_forward_malformed_packet-t": [
     "legacy-g2",
     "mysql-auto_increment_delay_multiplex=0-g2",
     "mysql-multiplexing=false-g2",
     "mysql-query_digests=0-g2",
-    "mysql-query_digests_keep_comment=1-g2"
+    "mysql-query_digests_keep_comment=1-g2",
+    "mysql84-g2",
+    "mysql90-g2",
+    "mysql95-g2"
   ],
   "reg_test_4001-restapi_scripts_num_fds-t": [
     "legacy-g2",
@@ -1620,6 +1807,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_4935-caching_sha2-t": [
@@ -1634,6 +1822,7 @@
   "reg_test_5212_tcp_keepalive_warnings-t": [
     "legacy-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_5233_set_warning-t": [
@@ -1643,6 +1832,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_5306-show_warnings_with_comment-t": [
@@ -1744,6 +1934,7 @@
     "mysql-query_digests=0-g1",
     "mysql-query_digests_keep_comment=1-g1",
     "mysql84-g1",
+    "mysql90-g1",
     "mysql95-g1"
   ],
   "reg_test_proxy_protocol_oversized_address-t": [
@@ -2095,7 +2286,10 @@
     "mysql-auto_increment_delay_multiplex=0-g3",
     "mysql-multiplexing=false-g3",
     "mysql-query_digests=0-g3",
-    "mysql-query_digests_keep_comment=1-g3"
+    "mysql-query_digests_keep_comment=1-g3",
+    "mysql84-g5",
+    "mysql90-g5",
+    "mysql95-g5"
   ],
   "test_com_binlog_dump_enables_fast_forward-t": [
     "legacy-binlog-g1",
@@ -2278,39 +2472,66 @@
   ],
   "test_ffto_pgsql-t": [
     "@proxysql_min_version:3.1",
-    "legacy-g4"
+    "legacy-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "test_ffto_pgsql_command_types-t": [
     "@proxysql_min_version:3.1",
-    "legacy-g4"
+    "legacy-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "test_ffto_pgsql_concurrent-t": [
     "@proxysql_min_version:3.1",
-    "legacy-g4"
+    "legacy-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "test_ffto_pgsql_error_stats-t": [
     "@proxysql_min_version:3.1",
-    "legacy-g4"
+    "legacy-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "test_ffto_pgsql_errors-t": [
     "@proxysql_min_version:3.1",
-    "legacy-g4"
+    "legacy-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "test_ffto_pgsql_large_resultsets-t": [
     "@proxysql_min_version:3.1",
-    "legacy-g4"
+    "legacy-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "test_ffto_pgsql_mixed_protocol-t": [
     "@proxysql_min_version:3.1",
-    "legacy-g4"
+    "legacy-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "test_ffto_pgsql_pipeline-t": [
     "@proxysql_min_version:3.1",
-    "legacy-g4"
+    "legacy-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "test_ffto_pgsql_stmt_portal-t": [
     "@proxysql_min_version:3.1",
-    "legacy-g4"
+    "legacy-g4",
+    "mysql84-g4",
+    "mysql90-g4",
+    "mysql95-g4"
   ],
   "test_filtered_set_statements-t": [
     "legacy-g3",
@@ -2690,8 +2911,11 @@
     "mysql-query_digests=0-g4",
     "mysql-query_digests_keep_comment=1-g4",
     "mysql84-g4",
+    "mysql84-g5",
     "mysql90-g4",
-    "mysql95-g4"
+    "mysql90-g5",
+    "mysql95-g4",
+    "mysql95-g5"
   ],
   "test_rw_binary_data-t": [
     "legacy-g4",