percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-26 15:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0' into mysql-8

Browse Source
This commit is contained in:
Carlos Salguero
2018-02-19 12:11:07 -03:00
parent 71e15315f0 430b8d7ffa
commit 8943e0a9f6
335 changed files with 3316 additions and 1399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
t/lib/VersionCheck.t
View File

@@ -201,7 +201,7 @@ is_deeply(
# Former Pingback tests
# #############################################################################
my $general_id = md5_hex( hostname() );
my $general_id = VersionCheck::get_uuid();
my $master_id; # the instance ID, _not_ 12345 etc.
my $slave1_id; # the instance ID, _not_ 12346 etc.
my ($mysql_ver, $mysql_distro);
@@ -679,6 +679,22 @@ foreach my $tool ( @vc_tools ) {
);
}
my $should_remove_uuid_file;
my $home_uuid_file = $ENV{"HOME"} . "/.percona-toolkit.uuid";
if ( ! -e $home_uuid_file ) {
$should_remove_uuid_file = 1;
}
my $uuid = VersionCheck::get_uuid();
is (
length($uuid),
36,
"Have a valid UUID4",
);
unlink $home_uuid_file if $should_remove_uuid_file;
# #############################################################################
# Done.
# #############################################################################

15
t/lib/samples/charset.sql Normal file
View File

@@ -0,0 +1,15 @@
DROP DATABASE IF EXISTS `test`;
CREATE DATABASE `test`;
CREATE TABLE `test`.`t1` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`f2` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) COMMENT "test1" ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `test`.`t2` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`f2` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;