percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 21:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-2340 - Support MySQL 8.4

Browse Source 
- Adjusted test results, broken due to mysql.component table in PS
This commit is contained in:
Sveta Smirnova
2024-09-06 16:10:36 +03:00
parent ea6bd77501
commit 045b2fec9f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
t/lib/SchemaIterator.t
View File

@@ -112,7 +112,7 @@ sub test_so {
update_sample => 1, update_sample => 1,
), ),
$args{test_name}, $args{test_name},
); ) or diag($test_diff);
} }
elsif ( $args{like} ) { elsif ( $args{like} ) {
like( like(
@@ -169,6 +169,7 @@ SKIP: {
# ######################################################################## # ########################################################################
# Test simple, unfiltered get_db_itr(). # Test simple, unfiltered get_db_itr().
# ######################################################################## # ########################################################################
# TODO: create flavor-dependent samples
test_so( test_so(
result => $sb->is_cluster_mode result => $sb->is_cluster_mode
? "$out/all-dbs-tbls-cluster-$sandbox_version.txt" ? "$out/all-dbs-tbls-cluster-$sandbox_version.txt"

2
t/lib/samples/SchemaIterator/all-dbs-tbls-8.4.txt
View File

@@ -16,7 +16,7 @@ CREATE TABLE `component` (
`component_group_id` int unsigned NOT NULL, `component_group_id` int unsigned NOT NULL,
`component_urn` text NOT NULL, `component_urn` text NOT NULL,
PRIMARY KEY (`component_id`) 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 mysql.db
CREATE TABLE `db` ( CREATE TABLE `db` (

4
t/pt-table-checksum/basics.t
View File

@@ -86,8 +86,8 @@ ok(
no_diff( no_diff(
$cmd, $cmd,
"$sample/default-results-$sandbox_version.txt", "$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\'', 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.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}\'', 'awk \'{print $2 " " $3 " " $4 " " $7 " " $9}\'',
keep_ouput => 1, keep_ouput => 1,
), ),