percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-17 01:01:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Various test fixes for MySQL 5.6.10 (which seems not to have mysql.hosts any longer).

Browse Source
This commit is contained in:
Daniel Nichter
2013-02-18 18:06:05 -07:00
parent 11a4edd8e8
commit eb2585fb32
6 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sandbox/load-sakila-db
View File

@@ -33,4 +33,8 @@ if [ ! -d "$PERCONA_TOOLKIT_BRANCH" ]; then
fi fi
/tmp/$PORT/use < $PERCONA_TOOLKIT_BRANCH/sandbox/sakila.sql /tmp/$PORT/use < $PERCONA_TOOLKIT_BRANCH/sandbox/sakila.sql
exit $? exit_status=$?
/tmp/$PORT/use sakila -e "ANALYZE TABLE actor, address, category, city, country, customer, film, film_actor, film_category, film_text, inventory, language, payment, rental, staff, store" >/dev/null
exit $exit_status

4
t/lib/NibbleIterator.t
View File

@@ -713,8 +713,8 @@ cmp_ok(
# ############################################################################ # ############################################################################
$ni = make_nibble_iter( $ni = make_nibble_iter(
db => 'mysql', db => 'mysql',
tbl => 'host', tbl => 'columns_priv',
argv => [qw(--tables mysql.host --chunk-size-limit 0)], argv => [qw(--tables mysql.columns_priv --chunk-size-limit 0)],
); );
@rows = (); @rows = ();

6
t/pt-table-checksum/basics.t
View File

@@ -104,7 +104,8 @@ ok(
$row = $master_dbh->selectrow_arrayref("select count(*) from percona.checksums"); $row = $master_dbh->selectrow_arrayref("select count(*) from percona.checksums");
is( is(
$row->[0], $row->[0],
( $sandbox_version gt "5.1" ? 90 ( $sandbox_version ge "5.6" ? 89
: $sandbox_version gt "5.1" ? 90
: $sandbox_version gt "5.0" ? 89 : $sandbox_version gt "5.0" ? 89
: 85), : 85),
'Expected checksums on master' 'Expected checksums on master'
@@ -113,7 +114,8 @@ is(
$row = $slave1_dbh->selectrow_arrayref("select count(*) from percona.checksums"); $row = $slave1_dbh->selectrow_arrayref("select count(*) from percona.checksums");
is( is(
$row->[0], $row->[0],
( $sandbox_version gt "5.1" ? 90 ( $sandbox_version ge "5.6" ? 89
: $sandbox_version gt "5.1" ? 90
: $sandbox_version gt "5.0" ? 89 : $sandbox_version gt "5.0" ? 89
: 85), : 85),
'Expected checksums on slave' 'Expected checksums on slave'

5
t/pt-table-checksum/bugs.t
View File

@@ -195,7 +195,7 @@ is(
# ############################################################################# # #############################################################################
($output) = output( ($output) = output(
sub { pt_table_checksum::main(@args, '--tables', 'mysql.user,mysql.host', sub { pt_table_checksum::main(@args, '--tables', 'mysql.user,mysql.db',
'--columns', 'some_fale_column') }, '--columns', 'some_fale_column') },
stderr => 1, stderr => 1,
); );
@@ -269,7 +269,7 @@ SKIP: {
"...and warns for both level 1 and level 2 slaves" "...and warns for both level 1 and level 2 slaves"
) or diag($output); ) or diag($output);
diag(`$trunk/sandbox/stop-sandbox 12348 12349`); diag(`$trunk/sandbox/stop-sandbox 12349 12348`);
} }
# ############################################################################# # #############################################################################
@@ -278,4 +278,3 @@ SKIP: {
$sb->wipe_clean($master_dbh); $sb->wipe_clean($master_dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing; done_testing;
exit;

11
t/pt-table-checksum/samples/default-results-5.5.txt
View File

@@ -3,11 +3,10 @@ ERRORS DIFFS ROWS SKIPPED TABLE
0 0 0 0 mysql.db 0 0 0 0 mysql.db
0 0 0 0 mysql.event 0 0 0 0 mysql.event
0 0 0 0 mysql.func 0 0 0 0 mysql.func
0 0 38 0 mysql.help_category 0 0 40 0 mysql.help_category
0 0 453 0 mysql.help_keyword 0 0 473 0 mysql.help_keyword
0 0 992 0 mysql.help_relation 0 0 1045 0 mysql.help_relation
0 0 220 0 mysql.help_topic 0 0 529 0 mysql.help_topic
0 0 0 0 mysql.host
0 0 0 0 mysql.ndb_binlog_index 0 0 0 0 mysql.ndb_binlog_index
0 0 0 0 mysql.plugin 0 0 0 0 mysql.plugin
0 0 0 0 mysql.proc 0 0 0 0 mysql.proc
@@ -21,7 +20,7 @@ ERRORS DIFFS ROWS SKIPPED TABLE
0 0 0 0 mysql.time_zone_transition 0 0 0 0 mysql.time_zone_transition
0 0 0 0 mysql.time_zone_transition_type 0 0 0 0 mysql.time_zone_transition_type
0 0 2 0 mysql.user 0 0 2 0 mysql.user
0 0 40 0 percona_test.checksums 0 0 37 0 percona_test.checksums
0 0 1 0 percona_test.load_data 0 0 1 0 percona_test.load_data
0 0 1 0 percona_test.sentinel 0 0 1 0 percona_test.sentinel
0 0 200 0 sakila.actor 0 0 200 0 sakila.actor

11
t/pt-table-checksum/samples/static-chunk-size-results-5.5.txt
View File

@@ -3,11 +3,10 @@ ERRORS DIFFS ROWS CHUNKS SKIPPED TABLE
0 0 0 1 0 mysql.db 0 0 0 1 0 mysql.db
0 0 0 1 0 mysql.event 0 0 0 1 0 mysql.event
0 0 0 1 0 mysql.func 0 0 0 1 0 mysql.func
0 0 38 1 0 mysql.help_category 0 0 40 1 0 mysql.help_category
0 0 453 1 0 mysql.help_keyword 0 0 473 1 0 mysql.help_keyword
0 0 992 1 0 mysql.help_relation 0 0 1045 1 0 mysql.help_relation
0 0 220 1 0 mysql.help_topic 0 0 529 1 0 mysql.help_topic
0 0 0 1 0 mysql.host
0 0 0 1 0 mysql.ndb_binlog_index 0 0 0 1 0 mysql.ndb_binlog_index
0 0 0 1 0 mysql.plugin 0 0 0 1 0 mysql.plugin
0 0 0 1 0 mysql.proc 0 0 0 1 0 mysql.proc
@@ -21,7 +20,7 @@ ERRORS DIFFS ROWS CHUNKS SKIPPED TABLE
0 0 0 1 0 mysql.time_zone_transition 0 0 0 1 0 mysql.time_zone_transition
0 0 0 1 0 mysql.time_zone_transition_type 0 0 0 1 0 mysql.time_zone_transition_type
0 0 2 1 0 mysql.user 0 0 2 1 0 mysql.user
0 0 40 1 0 percona_test.checksums 0 0 37 1 0 percona_test.checksums
0 0 1 1 0 percona_test.load_data 0 0 1 1 0 percona_test.load_data
0 0 1 1 0 percona_test.sentinel 0 0 1 1 0 percona_test.sentinel
0 0 200 1 0 sakila.actor 0 0 200 1 0 sakila.actor