percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-29 01:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fix-pt-osc-find-new-table-bug-1195628.

Browse Source
This commit is contained in:
Daniel Nichter
2013-12-10 20:47:29 -08:00
parent 1f6780e743 bfea5c0141
commit 0f9507559c
5 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ is(
$exit_status,
0,
"--dry-run exit 0 (bug 1058285)"
);
) or diag($output);
unlike(
$output,

4
t/pt-online-schema-change/basics.t
View File

@@ -13,6 +13,7 @@ use Test::More;
use Time::HiRes qw(sleep);
$ENV{PTTEST_FAKE_TS} = 1;
$ENV{PERCONA_TOOLKIT_TEST_USE_DSN_NAMES} = 1;
use PerconaTest;
use Sandbox;
@@ -704,7 +705,8 @@ ok(
no_diff(
sub { pt_online_schema_change::main(@args, "$dsn,D=bug_1045317,t=bits",
'--execute', '--statistics',
'--alter', "modify column val ENUM('M','E','H') NOT NULL")
'--alter', "modify column val ENUM('M','E','H') NOT NULL",
'--recursion-method', 'none')
},
($sandbox_version ge '5.5' && $db_flavor !~ m/XtraDB Cluster/
? "$sample/stats-execute-5.5.txt"

4
t/pt-online-schema-change/charset.t
View File

@@ -56,10 +56,10 @@ $sb->load_file('master', "$sample/basic_no_fks.sql");
my @create = split("\n\n", $output);
like(
$create[1],
$create[1] || '',
qr/DEFAULT CHARSET=utf8/,
"Can alter charset of new table"
);
) or diag($output);
# #############################################################################
# Done.

2
t/pt-online-schema-change/samples/stats-execute-5.5.txt
View File

@@ -1,3 +1,5 @@
No slaves found. See --recursion-method if host h=127.1,P=12345 has slaves.
Not checking slave lag because no slaves were found and --check-slave-lag was not specified.
Operation, tries, wait:
copy_rows, 10, 0.25
create_triggers, 10, 1