PT-1554 Improved MySQL 8 support on pt-osc

This commit is contained in:
Carlos Salguero
2018-06-15 00:00:04 -03:00
parent 14c1365a42
commit a90e5a78a0
2 changed files with 93 additions and 91 deletions

View File

@@ -8510,13 +8510,6 @@ sub main {
die "This tool requires MySQL 5.0.10 or newer.\n";
}
if ($server_version >= '8.0' && ($o->has('alter-foreign-keys-method') &&
$o->get('alter-foreign-keys-method') || "" eq 'drop_swap')) {
my $msg = "--alter-foreign-keys-method=drop_swap doesn't work with MySQL 8.0+\n".
"See https://bugs.mysql.com/bug.php?id=89441";
die($msg);
}
# Use LOCK IN SHARE mode unless MySQL 5.0 because there's a bug like
# http://bugs.mysql.com/bug.php?id=45694
my $lock_in_share_mode = $server_version < '5.1' ? 0 : 1;
@@ -9797,6 +9790,12 @@ sub main {
}
}
if ($server_version >= '8.0' && $alter_fk_method eq 'drop_swap') {
my $msg = "--alter-foreign-keys-method=drop_swap doesn't work with MySQL 8.0+\n".
"See https://bugs.mysql.com/bug.php?id=89441";
die($msg);
}
# --plugin hook
if ( $plugin && $plugin->can('after_copy_rows') ) {
$plugin->after_copy_rows();

View File

@@ -50,6 +50,8 @@ ok(
"ANSI modes set"
);
SKIP: {
skip "Skipping in MySQL 8.0.4-rc since there is an error in the server itself. See https://bugs.mysql.com/bug.php?id=89441", 9 if ($sandbox_version ge '8.0');
($output, $exit_status) = full_output(
sub { pt_online_schema_change::main(@args,
"$master_dsn,D=issue26211,t=process_model_inst",
@@ -136,6 +138,7 @@ unlike(
);
$dbh->do(q{DROP DATABASE IF EXISTS `bug_26211`});
}
# #############################################################################
# Done.