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

Updated tests & 5.7 sandbox files

Browse Source
This commit is contained in:
Carlos Salguero
2017-04-27 12:06:43 -03:00
parent 92ac5987e1
commit a6c55737f5
11 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/pt-config-diff
View File

@@ -3390,6 +3390,7 @@ sub new {
my %value_is_optional = (
log_error => 1,
log_isam => 1,
secure_file_priv => 1,
($args{optional_value_variables}
? map { $_ => 1 } @{$args{optional_value_variables}}
: ()),

1
lib/MySQLConfigComparer.pm
View File

@@ -83,6 +83,7 @@ sub new {
my %value_is_optional = (
log_error => 1,
log_isam => 1,
secure_file_priv => 1,
($args{optional_value_variables}
? map { $_ => 1 } @{$args{optional_value_variables}}
: ()),

BIN
sandbox/servers/5.7/data.tar.gz Normal file → Executable file
View File

Binary file not shown.

29
sandbox/servers/5.7/system_idb_tables.sql
View File

@@ -330,37 +330,8 @@ CREATE TABLE IF NOT EXISTS `slow_log` (
`sql_text` mediumblob NOT NULL,
`thread_id` bigint(21) unsigned NOT NULL
) ENGINE=CSV DEFAULT CHARSET=utf8 COMMENT='Slow log';
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `mysql`.`slave_master_info` (
`Number_of_lines` int(10) unsigned NOT NULL COMMENT 'Number of lines in the file.',
`Master_log_name` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT 'The name of the master binary log currently being read from the master.',
`Master_log_pos` bigint(20) unsigned NOT NULL COMMENT 'The master log position of the last read event.',
`Host` char(64) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL COMMENT 'The host name of the master.',
`User_name` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The user name used to connect to the master.',
`User_password` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The password used to connect to the master.',
`Port` int(10) unsigned NOT NULL COMMENT 'The network port used to connect to the master.',
`Connect_retry` int(10) unsigned NOT NULL COMMENT 'The period (in seconds) that the slave will wait before trying to reconnect to the master.',
`Enabled_ssl` tinyint(1) NOT NULL COMMENT 'Indicates whether the server supports SSL connections.',
`Ssl_ca` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Authority (CA) certificate.',
`Ssl_capath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path to the Certificate Authority (CA) certificates.',
`Ssl_cert` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The name of the SSL certificate file.',
`Ssl_cipher` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The name of the cipher in use for the SSL connection.',
`Ssl_key` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The name of the SSL key file.',
`Ssl_verify_server_cert` tinyint(1) NOT NULL COMMENT 'Whether to verify the server certificate.',
`Heartbeat` float NOT NULL,
`Bind` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Displays which interface is employed when connecting to the MySQL server',
`Ignored_server_ids` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The number of server IDs to be ignored, followed by the actual server IDs',
`Uuid` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The master server uuid.',
`Retry_count` bigint(20) unsigned NOT NULL COMMENT 'Number of reconnect attempts, to the master, before giving up.',
`Ssl_crl` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The file used for the Certificate Revocation List (CRL)',
`Ssl_crlpath` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'The path used for Certificate Revocation List (CRL) files',
`Enabled_auto_position` tinyint(1) NOT NULL COMMENT 'Indicates whether GTIDs will be used to retrieve events from the master.',
`Channel_name` char(64) NOT NULL COMMENT 'The channel on which the slave is connected to a source. Used in Multisource Replication',
`Tls_version` text CHARACTER SET utf8 COLLATE utf8_bin COMMENT 'Tls version',
PRIMARY KEY (`Channel_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 STATS_PERSISTENT=0 COMMENT='Master Information';
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

22
t/lib/KeySize.t
View File

@@ -143,8 +143,7 @@ is(
'',
'No error (issue 364)'
);
like(
$ks->explain(),
my $want = $sandbox_version lt '5.7' ?
qr/^extra: Using where; Using index
id: 1
key: BASE_KID_ID
@@ -154,9 +153,26 @@ ref: NULL
rows: 17[1-9]
select_type: SIMPLE
table: issue_364
type: index\Z/,
type: index\Z/ :
qr/^extra: Using where; Using index
filtered: 1.13
id: 1
key: BASE_KID_ID
key_len: 17
partitions: NULL
possible_keys: BASE_KID_ID
ref: NULL
rows: 176
select_type: SIMPLE
table: issue_364
type: index/;
like(
$ks->explain(),
$want,
'EXPLAIN plan (issue 364)'
);
is(
$ks->query(),
'EXPLAIN SELECT BASE_KID_ID, ID FROM `test`.`issue_364` FORCE INDEX (`BASE_KID_ID`) WHERE BASE_KID_ID=1 OR ID=1',

2
t/lib/VersionCheck.t
View File

@@ -670,7 +670,7 @@ my @vc_tools = grep { chomp; basename($_) =~ /\A[a-z-]+\z/ }
foreach my $tool ( @vc_tools ) {
my $tool_name = basename($tool);
next if $tool_name eq 'pt-agent';
next if $tool_name eq 'pt-agent' || $tool_name =~ m/^pt-mongodb-/;
my $output = `$tool --help`;
like(
$output,

6
t/pt-query-digest/history.t
View File

@@ -139,10 +139,14 @@ my $expected = [ { lock_time_median => '0',
normalize_numbers($res);
normalize_numbers($expected);
diag('--------------------------------------------------------');
diag(Data::Dumper::Dumper($res));
diag('--------------------------------------------------------');
is_deeply(
$res,
$expected,
'Adds/updates queries to query review history table'
'Adds/updates queries to query review history table',
);

4
t/pt-query-digest/samples/issue_1196-output-5.7.txt
View File

@@ -45,7 +45,7 @@ select t.a, count(*) from t join t t2 using(a) group by 1 order by 2 desc limit
# key_len: NULL
# ref: NULL
# rows: 14
# filtered: 100.00
# filtered: 100
# Extra: Using temporary; Using filesort
# *************************** 2. row ***************************
# id: 1
@@ -58,5 +58,5 @@ select t.a, count(*) from t join t t2 using(a) group by 1 order by 2 desc limit
# key_len: NULL
# ref: NULL
# rows: 14
# filtered: 10.00
# filtered: 10
# Extra: Using where; Using join buffer (Block Nested Loop)

2
t/pt-query-digest/samples/slow007_explain_1-57.txt
View File

@@ -41,5 +41,5 @@ SELECT fruit FROM trees\G
# key_len: 27
# ref: NULL
# rows: 1
# filtered: 100.00
# filtered: 100
# Extra: Using index

2
t/pt-query-digest/samples/slow007_explain_2-57.txt
View File

@@ -41,5 +41,5 @@ SELECT fruit FROM trees\G
# key_len: 27
# ref: NULL
# rows: 3
# filtered: 100.00
# filtered: 100
# Extra: Using index