PT-2295 - Fix tests on distributions

- disabled test 'Single column int key' in 8.0.35+ until
  https://bugs.mysql.com/bug.php?id=113892 is fixed
- Fixed data for 'Two column int key' test

t/lib/KeySize.t

@@ -17,6 +17,7 @@ use Quoter;
 use DSNParser;
 use Sandbox;
 use PerconaTest;
+require VersionParser;
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
@@ -64,13 +65,18 @@ is(
 
 # Populate the table to make the WHERE possible.
 $dbh->do('INSERT INTO test.dupe_key VALUE (1,2,3),(4,5,6),(7,8,9),(0,0,0)');
-is_deeply(
-   [$ks->get_key_size(%key)],
-   [20, 'a'],
-   'Single column int key'
-);
+
+SKIP: {
+   skip "MySQL error https://bugs.mysql.com/bug.php?id=113892", 1 if ($sandbox_version ge '8.0' and VersionParser->new($dbh) ge '8.0.35');
+   is_deeply(
+      [$ks->get_key_size(%key)],
+      [20, 'a'],
+      'Single column int key'
+   );
+}
 
 $key{name} = 'a_2';
+$key{cols} = $key{tbl_struct}->{keys}->{'a_2'}->{cols};
 is_deeply(
    [$ks->get_key_size(%key)],
    [40, 'a_2'],

t/lib/bash/collect.sh

@@ -192,6 +192,7 @@ collect "$PT_TMPDIR/collect" "2011_12_05" > $p-output 2>&1
 CMD_OPCONTROL=""
 OPT_COLLECT_OPROFILE=""
 
+cat $p-df | grep -c '^TS '
 iters=$(cat $p-df | grep -c '^TS ')
 is "$iters" "2" "2 iteration/2s run time"
 

t/pt-query-digest/explain.t

@@ -145,9 +145,11 @@ ok(
        : $sandbox_version ge '5.6' ? "t/pt-query-digest/samples/issue_1196-output-5.6.txt"
        : $sandbox_version ge '5.1' ? "t/pt-query-digest/samples/issue_1196-output.txt"
        :                             "t/pt-query-digest/samples/issue_1196-output-5.0.txt"),
+      keep_output => 1,
    ),
    "--explain sparkline uses event db and doesn't crash ea (issue 1196)"
-);
+) or diag(`cat /tmp/percona-toolkit-test-output.txt`);
+diag(`rm /tmp/percona-toolkit-test-output.txt`);
 
 # #############################################################################
 # Done.