From 045b2fec9fcebcd71ab217748f2594dbc66cedf6 Mon Sep 17 00:00:00 2001
From: Sveta Smirnova <sveta.smirnova@percona.com>
Date: Fri, 6 Sep 2024 16:10:36 +0300
Subject: [PATCH] PT-2340 - Support MySQL 8.4

- Adjusted test results, broken due to mysql.component table in PS
---
 t/lib/SchemaIterator.t                            | 3 ++-
 t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt | 2 +-
 t/pt-table-checksum/basics.t                      | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/t/lib/SchemaIterator.t b/t/lib/SchemaIterator.t
index 6f3e5a74..db1fc787 100644
--- a/t/lib/SchemaIterator.t
+++ b/t/lib/SchemaIterator.t
@@ -112,7 +112,7 @@ sub test_so {
             update_sample => 1,
          ),
          $args{test_name},
-      );
+      ) or diag($test_diff);
    }
    elsif ( $args{like} ) {
       like(
@@ -169,6 +169,7 @@ SKIP: {
    # ########################################################################
    # Test simple, unfiltered get_db_itr().
    # ########################################################################
+   # TODO: create flavor-dependent samples
    test_so(
       result    => $sb->is_cluster_mode 
 	     ? "$out/all-dbs-tbls-cluster-$sandbox_version.txt" 
diff --git a/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt b/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt
index efc6f1cb..012249de 100644
--- a/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt
+++ b/t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt
@@ -16,7 +16,7 @@ CREATE TABLE `component` (
   `component_group_id` int unsigned NOT NULL,
   `component_urn` text NOT NULL,
   PRIMARY KEY (`component_id`)
-) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='Components'
+) /*!50100 TABLESPACE `mysql` */ ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 ROW_FORMAT=DYNAMIC COMMENT='Components'
 
 mysql.db
 CREATE TABLE `db` (
diff --git a/t/pt-table-checksum/basics.t b/t/pt-table-checksum/basics.t
index 6cb71a8f..c1e8ad43 100644
--- a/t/pt-table-checksum/basics.t
+++ b/t/pt-table-checksum/basics.t
@@ -86,8 +86,8 @@ ok(
    no_diff(
       $cmd,
       "$sample/default-results-$sandbox_version.txt",
-      sed_out => '\'/mysql.plugin$/d; /percona_test.checksums$/d; /mysql.help_category$/d; /mysql.help_keyword$/d; /mysql.help_relation$/d; /mysql.help_topic$/d; /mysql.columns_priv$/d; /mysql.engine_cost$/d; /mysql.general_log$/d; /mysql.innodb_index_stats$/d; /mysql.innodb_table_stats$/d; /mysql.password_history$/d; /mysql.procs_priv$/d; /mysql.proxies_priv$/d; /mysql.server_cost$/d; /mysql.slow_log$/d; /mysql.tables_priv$/d\'',
-      post_pipe => 'sed \'/mysql.plugin$/d; /percona_test.checksums$/d; /mysql.help_category$/d; /mysql.help_keyword$/d; /mysql.help_relation$/d; /mysql.help_topic$/d; /mysql.ndb_binlog_index$/d; /mysql.global_grants$/d; /mysql.columns_priv$/d; /mysql.engine_cost$/d; /mysql.general_log$/d; /mysql.innodb_index_stats$/d; /mysql.innodb_table_stats$/d; /mysql.password_history$/d; /mysql.procs_priv$/d; /mysql.proxies_priv$/d; /mysql.server_cost$/d; /mysql.slow_log$/d; /mysql.tables_priv$/d\' | ' .
+      sed_out => '\'/mysql.plugin$/d; /percona_test.checksums$/d; /mysql.help_category$/d; /mysql.help_keyword$/d; /mysql.help_relation$/d; /mysql.help_topic$/d; /mysql.columns_priv$/d; /mysql.component$/d; /mysql.engine_cost$/d; /mysql.general_log$/d; /mysql.innodb_index_stats$/d; /mysql.innodb_table_stats$/d; /mysql.password_history$/d; /mysql.procs_priv$/d; /mysql.proxies_priv$/d; /mysql.server_cost$/d; /mysql.slow_log$/d; /mysql.tables_priv$/d\'',
+      post_pipe => 'sed \'/mysql.plugin$/d; /percona_test.checksums$/d; /mysql.help_category$/d; /mysql.help_keyword$/d; /mysql.help_relation$/d; /mysql.help_topic$/d; /mysql.ndb_binlog_index$/d; /mysql.global_grants$/d; /mysql.columns_priv$/d; /mysql.component$/d; /mysql.engine_cost$/d; /mysql.general_log$/d; /mysql.innodb_index_stats$/d; /mysql.innodb_table_stats$/d; /mysql.password_history$/d; /mysql.procs_priv$/d; /mysql.proxies_priv$/d; /mysql.server_cost$/d; /mysql.slow_log$/d; /mysql.tables_priv$/d\' | ' .
                    'awk \'{print $2 " " $3 " " $4 " " $7 " " $9}\'',
       keep_ouput => 1,
    ),