PT-1554 Fixed tests for MySQL 8

This commit is contained in:
Carlos Salguero
2018-06-22 14:56:02 -03:00
parent d9142df0f6
commit 4f017cc61a
6 changed files with 11 additions and 7 deletions
+2 -1
View File
@@ -50,7 +50,8 @@ $slave_dbh->do('create table issue_907.t (i int)');
$slave_dbh->do('insert into issue_907.t values (1)');
# On 5.1 user needs SUPER to set binlog_format, which mk-table-sync does.
`/tmp/12345/use -uroot -e "GRANT SUPER, SELECT, UPDATE, SHOW DATABASES ON *.* TO 'test_907'\@'localhost' IDENTIFIED BY 'msandbox'"`;
`/tmp/12345/use -uroot -e "CREATE USER 'test_907'\@'localhost' IDENTIFIED BY 'msandbox'"`;
`/tmp/12345/use -uroot -e "GRANT SUPER, SELECT, UPDATE, SHOW DATABASES ON *.* TO 'test_907'\@'localhost'"`;
#2) run again to see what output is like when it works
chomp($output = output(
+3 -1
View File
@@ -9,7 +9,7 @@ BEGIN {
use strict;
use warnings FATAL => 'all';
use English qw(-no_match_vars);
use Test::More tests => 4;
use Test::More;
use PerconaTest;
use Sandbox;
@@ -20,6 +20,8 @@ my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
if ($sandbox_version ge '8.0') {
plan skip_all => "TODO master master sandbox is failing with MySQL 8.0+. FIX ME !!!!";
} else {
plan 4;
}
# #############################################################################
+2 -2
View File
@@ -36,7 +36,7 @@ elsif ( !$slave1_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave2';
}
else {
plan tests => 5;
plan tests => 4;
}
my ($output, $status);
@@ -77,7 +77,7 @@ is(
$row->{f2},
$want,
"Character set is correct",
);
) or diag("Want '$want', got '$row->{f2}");
SKIP: {
skip "Skipping in MySQL 8.0.4-rc since there is an error in the server itself", 1 if ($sandbox_version ge '8.0');