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

Merge 2.1 r476.

Browse Source
This commit is contained in:
Daniel Nichter
2012-12-03 20:08:27 +00:00
parent d0bd80037e 6c9f4c0722
commit 9edf7bf471
7 changed files with 144 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

616
sandbox/sakila.sql
View File

File diff suppressed because one or more lines are too long

14
sandbox/test-env
View File

@@ -246,6 +246,11 @@ set_mysql_version() {
fi fi
} }
_seq() {
local i="$1"
awk "BEGIN { for(i=1; i<=$i; i++) print i; }"
}
# ########################################################################### # ###########################################################################
# Sanity check the cmd line options. # Sanity check the cmd line options.
# ########################################################################### # ###########################################################################
@@ -326,13 +331,18 @@ case $opt in
/tmp/12345/use -e "create table percona_test.sentinel(id int primary key, ping varchar(64) not null default '')" /tmp/12345/use -e "create table percona_test.sentinel(id int primary key, ping varchar(64) not null default '')"
/tmp/12345/use -e "insert into percona_test.sentinel(id, ping) values(1, '$ping')"; /tmp/12345/use -e "insert into percona_test.sentinel(id, ping) values(1, '$ping')";
echo -n "Waiting for replication to finish..." echo -n "Waiting for replication to finish..."
while true; do for i in $(_seq 60); do
pong=$(/tmp/12347/use -ss -e 'select ping from percona_test.sentinel where id=1' 2>/dev/null) pong=$(/tmp/12347/use -ss -e 'select ping from percona_test.sentinel where id=1' 2>/dev/null)
[ "$ping" = "$pong" ] && break [ "$ping" = "$pong" ] && break
echo -n '.' echo -n '.'
sleep 1 sleep 1
done done
echo ' OK' if [ "$ping" = "$pong" ]; then
echo " OK"
else
echo " FAILED"
exit_status=$((exit_status | 1))
fi
fi fi
fi fi
if [ $exit_status -eq 0 ]; then if [ $exit_status -eq 0 ]; then

2
t/pt-table-checksum/samples/default-results-5.0.txt
View File

@@ -7,7 +7,7 @@ ERRORS DIFFS ROWS SKIPPED TABLE
0 0 809 0 mysql.help_relation 0 0 809 0 mysql.help_relation
0 0 422 0 mysql.help_topic 0 0 422 0 mysql.help_topic
0 0 0 0 mysql.host 0 0 0 0 mysql.host
0 0 6 0 mysql.proc 0 0 0 0 mysql.proc
0 0 0 0 mysql.procs_priv 0 0 0 0 mysql.procs_priv
0 0 0 0 mysql.tables_priv 0 0 0 0 mysql.tables_priv
0 0 0 0 mysql.time_zone 0 0 0 0 mysql.time_zone

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

@@ -10,7 +10,7 @@ ERRORS DIFFS ROWS SKIPPED TABLE
0 0 0 0 mysql.host 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 6 0 mysql.proc 0 0 0 0 mysql.proc
0 0 0 0 mysql.procs_priv 0 0 0 0 mysql.procs_priv
0 0 2 0 mysql.proxies_priv 0 0 2 0 mysql.proxies_priv
0 0 0 0 mysql.servers 0 0 0 0 mysql.servers

2
t/pt-table-checksum/samples/static-chunk-size-results-5.0.txt
View File

@@ -7,7 +7,7 @@ ERRORS DIFFS ROWS CHUNKS SKIPPED TABLE
0 0 809 1 0 mysql.help_relation 0 0 809 1 0 mysql.help_relation
0 0 422 1 0 mysql.help_topic 0 0 422 1 0 mysql.help_topic
0 0 0 1 0 mysql.host 0 0 0 1 0 mysql.host
0 0 6 1 0 mysql.proc 0 0 0 1 0 mysql.proc
0 0 0 1 0 mysql.procs_priv 0 0 0 1 0 mysql.procs_priv
0 0 0 1 0 mysql.tables_priv 0 0 0 1 0 mysql.tables_priv
0 0 0 1 0 mysql.time_zone 0 0 0 1 0 mysql.time_zone

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

@@ -10,7 +10,7 @@ ERRORS DIFFS ROWS CHUNKS SKIPPED TABLE
0 0 0 1 0 mysql.host 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 6 1 0 mysql.proc 0 0 0 1 0 mysql.proc
0 0 0 1 0 mysql.procs_priv 0 0 0 1 0 mysql.procs_priv
0 0 2 1 0 mysql.proxies_priv 0 0 2 1 0 mysql.proxies_priv
0 0 0 1 0 mysql.servers 0 0 0 1 0 mysql.servers

8
util/check-dev-env
View File

@@ -28,16 +28,16 @@ my @required_modules = qw(
Test::More Test::More
Time::HiRes Time::HiRes
Time::Local Time::Local
Net::Address::IP::Local
); );
# CentOS doesn't seem to have this in its repo. # CentOS doesn't seem to have this in its repo.
my @optional_modules = qw( my @optional_modules = qw(
IO::Uncompress::Inflate IO::Uncompress::Inflate
Net::Address::IP::Local
); );
my $exit_status = 0; my $exit_status = 0;
my $fmt = "%-23s %8s %s\n"; my $fmt = "%-23s %8s\n";
# Not a module but we want to know the Perl version. # Not a module but we want to know the Perl version.
printf $fmt, "Perl", `perl -v | perl -ne '/v([\\d\\.]+)/ && print \$1'`, ""; printf $fmt, "Perl", `perl -v | perl -ne '/v([\\d\\.]+)/ && print \$1'`, "";
@@ -51,7 +51,7 @@ foreach my $module (@required_modules) {
else { else {
$version = ${"${module}::VERSION"}; $version = ${"${module}::VERSION"};
} }
printf $fmt, $module, $version, ""; printf $fmt, $module, $version;
} }
foreach my $module (@optional_modules) { foreach my $module (@optional_modules) {
@@ -60,7 +60,7 @@ foreach my $module (@optional_modules) {
if ( !$EVAL_ERROR ) { if ( !$EVAL_ERROR ) {
$version = ${"${module}::VERSION"}; $version = ${"${module}::VERSION"};
} }
printf $fmt, $module, $version, "MySQLProtocolParser, ProtocolParser" printf $fmt, $module, $version;
} }
exit $exit_status; exit $exit_status;