percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-12 06:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-1554 Improved MySQL 8 support on pt-osc

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/pt-online-schema-change
View File

@@ -8510,13 +8510,6 @@ sub main {
die "This tool requires MySQL 5.0.10 or newer.\n"; 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 # Use LOCK IN SHARE mode unless MySQL 5.0 because there's a bug like
# http://bugs.mysql.com/bug.php?id=45694 # http://bugs.mysql.com/bug.php?id=45694
my $lock_in_share_mode = $server_version < '5.1' ? 0 : 1; 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 # --plugin hook
if ( $plugin && $plugin->can('after_copy_rows') ) { if ( $plugin && $plugin->can('after_copy_rows') ) {
$plugin->after_copy_rows(); $plugin->after_copy_rows();

71
t/pt-online-schema-change/ansi_quotes.t
View File

@@ -50,92 +50,95 @@ ok(
"ANSI modes set" "ANSI modes set"
); );
($output, $exit_status) = full_output( 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, sub { pt_online_schema_change::main(@args,
"$master_dsn,D=issue26211,t=process_model_inst", "$master_dsn,D=issue26211,t=process_model_inst",
"--alter", "ADD COLUMN foo int", "--alter", "ADD COLUMN foo int",
qw(--dry-run --print --alter-foreign-keys-method auto)) }, qw(--dry-run --print --alter-foreign-keys-method auto)) },
); );
is( is(
$exit_status, $exit_status,
0, 0,
"--dry-run exit 0 (bug 1058285)" "--dry-run exit 0 (bug 1058285)"
) or diag($output); ) or diag($output);
unlike( unlike(
$output, $output,
qr/errno: 121/, qr/errno: 121/,
"No error 121 (bug 1058285)" "No error 121 (bug 1058285)"
); );
my ($sql_mode) = $dbh->selectrow_array(q{SELECT @@SQL_MODE}); my ($sql_mode) = $dbh->selectrow_array(q{SELECT @@SQL_MODE});
is( is(
$sql_mode, $sql_mode,
$orig_sql_mode, $orig_sql_mode,
"--dry-run SQL_MODE not changed" "--dry-run SQL_MODE not changed"
); );
($output, $exit_status) = full_output( ($output, $exit_status) = full_output(
sub { pt_online_schema_change::main(@args, sub { pt_online_schema_change::main(@args,
"$master_dsn,D=issue26211,t=process_model_inst", "$master_dsn,D=issue26211,t=process_model_inst",
"--alter", "ADD COLUMN foo int", "--alter", "ADD COLUMN foo int",
qw(--execute --alter-foreign-keys-method auto)) }, qw(--execute --alter-foreign-keys-method auto)) },
); );
is( is(
$exit_status, $exit_status,
0, 0,
"--execute exit 0 (bug 1058285)" "--execute exit 0 (bug 1058285)"
); );
unlike( unlike(
$output, $output,
qr/\QI need a max_rows argument/, qr/\QI need a max_rows argument/,
"No 'I need a max_rows' error message (bug 1073996)" "No 'I need a max_rows' error message (bug 1073996)"
); );
# ANSI_QUOTES are on, so it's "foo" not `foo`. # ANSI_QUOTES are on, so it's "foo" not `foo`.
my $rows = $dbh->selectrow_arrayref("SHOW CREATE TABLE issue26211.process_model_inst"); my $rows = $dbh->selectrow_arrayref("SHOW CREATE TABLE issue26211.process_model_inst");
like( like(
$rows->[1], $rows->[1],
qr/"foo"\s+int/i, qr/"foo"\s+int/i,
"--alter actually worked (bug 1058285)" "--alter actually worked (bug 1058285)"
); );
($sql_mode) = $dbh->selectrow_array(q{SELECT @@SQL_MODE}); ($sql_mode) = $dbh->selectrow_array(q{SELECT @@SQL_MODE});
is( is(
$sql_mode, $sql_mode,
$orig_sql_mode, $orig_sql_mode,
"--execute SQL_MODE not changed" "--execute SQL_MODE not changed"
); );
# ############################################################################ # ############################################################################
# pt-online-schema-change foreign key error # pt-online-schema-change foreign key error
# Customer issue 26211 # Customer issue 26211
# ############################################################################ # ############################################################################
$sb->load_file('master1', "$sample/issue-26211.sql"); $sb->load_file('master1', "$sample/issue-26211.sql");
my $retval; my $retval;
($output, $retval) = full_output(sub { pt_online_schema_change::main(@args, ($output, $retval) = full_output(sub { pt_online_schema_change::main(@args,
'--alter-foreign-keys-method', 'auto', '--alter-foreign-keys-method', 'auto',
'--no-check-replication-filters', '--no-check-replication-filters',
'--alter', "ENGINE=InnoDB", '--alter', "ENGINE=InnoDB",
'--execute', "$master_dsn,D=bug_26211,t=prm_inst")}); '--execute', "$master_dsn,D=bug_26211,t=prm_inst")});
is( is(
$retval, $retval,
0, 0,
"Issue 26211: Lives ok" "Issue 26211: Lives ok"
) or diag($output); ) or diag($output);
unlike( unlike(
$output, $output,
qr/\QI need a max_rows argument/, qr/\QI need a max_rows argument/,
"Issue 26211: No error message" "Issue 26211: No error message"
); );
$dbh->do(q{DROP DATABASE IF EXISTS `bug_26211`}); $dbh->do(q{DROP DATABASE IF EXISTS `bug_26211`});
}
# ############################################################################# # #############################################################################
# Done. # Done.