mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-10 21:19:59 +00:00
Use --version-check instead (so it's _not_ on by default; it must be specified).
This commit is contained in:
@@ -6825,9 +6825,7 @@ User for login if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -6837,10 +6835,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=item --where
|
=item --where
|
||||||
|
@@ -4361,9 +4361,7 @@ MySQL user if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -4373,10 +4371,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -4289,9 +4289,7 @@ User for login if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -4301,10 +4299,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -5170,9 +5170,7 @@ aggregated into one line, the first timestamp is shown.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -5182,10 +5180,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -4955,9 +4955,7 @@ Output all keys and/or foreign keys found, not just redundant ones.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -4967,10 +4965,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -4073,9 +4073,7 @@ User for login if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -4085,10 +4083,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -3536,9 +3536,7 @@ User for login if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -3548,10 +3546,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -5472,9 +5472,7 @@ User for login if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -5484,10 +5482,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -7000,9 +7000,7 @@ User for login if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -7012,10 +7010,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -6961,9 +6961,7 @@ User for login if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -6973,10 +6971,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=item --victims
|
=item --victims
|
||||||
|
@@ -9605,9 +9605,7 @@ User for login if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -9617,10 +9615,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -8234,9 +8234,7 @@ L<"--report-format">.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -8246,10 +8244,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=item --where
|
=item --where
|
||||||
|
@@ -16648,9 +16648,7 @@ distinct checksums are treated as equal.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -16660,10 +16658,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=item --watch-server
|
=item --watch-server
|
||||||
|
@@ -4119,9 +4119,7 @@ User for login if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -4131,10 +4129,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -5038,9 +5038,7 @@ the current sleep time each time pt-slave-restart sleeps.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -5050,10 +5048,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -10828,9 +10828,7 @@ group: Help
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -10840,10 +10838,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=item --where
|
=item --where
|
||||||
|
@@ -12054,9 +12054,7 @@ See L<"OUTPUT"> for more details about the output.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -12066,10 +12064,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=item --wait
|
=item --wait
|
||||||
|
@@ -12635,9 +12635,7 @@ User for login if not current user.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -12647,10 +12645,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=item --zero-query-times
|
=item --zero-query-times
|
||||||
|
@@ -5393,9 +5393,7 @@ higher levels, the program prints more of the description.
|
|||||||
|
|
||||||
Show version and exit.
|
Show version and exit.
|
||||||
|
|
||||||
=item --[no]version-check
|
=item --version-check
|
||||||
|
|
||||||
default: yes
|
|
||||||
|
|
||||||
Send program versions to Percona and print suggested upgrades and problems.
|
Send program versions to Percona and print suggested upgrades and problems.
|
||||||
|
|
||||||
@@ -5405,10 +5403,6 @@ machine. Percona uses the data to focus development on the most widely
|
|||||||
used versions of programs, and to suggest to customers possible upgrades
|
used versions of programs, and to suggest to customers possible upgrades
|
||||||
and known bad versions of programs.
|
and known bad versions of programs.
|
||||||
|
|
||||||
This feature can be disabled by specifying C<--no-version-check> on the
|
|
||||||
command line or in one of several L<"--config"> files, or by setting the
|
|
||||||
environment variable C<PERCONA_VERSION_CHECK=0>.
|
|
||||||
|
|
||||||
For more information, visit L<http://www.percona.com/version-check>.
|
For more information, visit L<http://www.percona.com/version-check>.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
@@ -83,10 +83,6 @@ eval {
|
|||||||
|
|
||||||
our $can_load_data = can_load_data();
|
our $can_load_data = can_load_data();
|
||||||
|
|
||||||
# We do not want every test doing the version-check;
|
|
||||||
# that would be quite slow.
|
|
||||||
$ENV{PERCONA_VERSION_CHECK} = 0;
|
|
||||||
|
|
||||||
our $dsn_opts = [
|
our $dsn_opts = [
|
||||||
{
|
{
|
||||||
key => 'A',
|
key => 'A',
|
||||||
|
@@ -18,9 +18,6 @@ use File::Spec;
|
|||||||
use Time::HiRes qw(time);
|
use Time::HiRes qw(time);
|
||||||
require "$trunk/bin/pt-archiver";
|
require "$trunk/bin/pt-archiver";
|
||||||
|
|
||||||
# PerconaTest.pm sets this because normal tests shouldn't v-c.
|
|
||||||
delete $ENV{PERCONA_VERSION_CHECK};
|
|
||||||
|
|
||||||
my $dp = new DSNParser(opts=>$dsn_opts);
|
my $dp = new DSNParser(opts=>$dsn_opts);
|
||||||
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
|
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
|
||||||
my $master_dbh = $sb->get_dbh_for('master');
|
my $master_dbh = $sb->get_dbh_for('master');
|
||||||
@@ -43,7 +40,7 @@ unlink $check_time_file if -f $check_time_file;
|
|||||||
$sb->create_dbs($master_dbh, ['test']);
|
$sb->create_dbs($master_dbh, ['test']);
|
||||||
$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
|
$sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
|
||||||
|
|
||||||
$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge 2>&1`;
|
$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge --version-check 2>&1`;
|
||||||
|
|
||||||
like(
|
like(
|
||||||
$output,
|
$output,
|
||||||
@@ -67,7 +64,7 @@ ok(
|
|||||||
# v-c file should limit checks to 1 per 24 hours
|
# v-c file should limit checks to 1 per 24 hours
|
||||||
# ###########################################################################
|
# ###########################################################################
|
||||||
|
|
||||||
$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge 2>&1`;
|
$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge --version-check 2>&1`;
|
||||||
|
|
||||||
like(
|
like(
|
||||||
$output,
|
$output,
|
||||||
@@ -83,7 +80,7 @@ unlink $check_time_file if -f $check_time_file;
|
|||||||
|
|
||||||
my $t0 = time;
|
my $t0 = time;
|
||||||
|
|
||||||
$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK_URL='http://x.percona.com' $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge 2>&1`;
|
$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK_URL='http://x.percona.com' $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge --version-check 2>&1`;
|
||||||
|
|
||||||
my $t = time - $t0;
|
my $t = time - $t0;
|
||||||
|
|
||||||
@@ -105,17 +102,18 @@ cmp_ok(
|
|||||||
);
|
);
|
||||||
|
|
||||||
# ###########################################################################
|
# ###########################################################################
|
||||||
# Disable the v-c.
|
# Disable the v-c (for now it's disabled by default, so by "disable" here
|
||||||
|
# we just mean "don't pass --version-check").
|
||||||
# ###########################################################################
|
# ###########################################################################
|
||||||
|
|
||||||
unlink $check_time_file if -f $check_time_file;
|
unlink $check_time_file if -f $check_time_file;
|
||||||
|
|
||||||
$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge --no-version-check 2>&1`;
|
$output = `PTVCDEBUG=1 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge 2>&1`;
|
||||||
|
|
||||||
unlike(
|
unlike(
|
||||||
$output,
|
$output,
|
||||||
qr/(?:VersionCheck|Pingback|Percona suggests)/,
|
qr/(?:VersionCheck|Pingback|Percona suggests)/,
|
||||||
"Looks like --no-version-check disabled the version-check"
|
"Looks like no --version-check disabled the version-check"
|
||||||
) or diag($output);
|
) or diag($output);
|
||||||
|
|
||||||
ok(
|
ok(
|
||||||
@@ -126,7 +124,7 @@ ok(
|
|||||||
# PERCONA_VERSION_CHECK=0 is handled in Pingback, so it will print a line
|
# PERCONA_VERSION_CHECK=0 is handled in Pingback, so it will print a line
|
||||||
# for PTVCDEBUG saying why it didn't run. So we just check that it doesn't
|
# for PTVCDEBUG saying why it didn't run. So we just check that it doesn't
|
||||||
# create the file which also signifies that it didn't run.
|
# create the file which also signifies that it didn't run.
|
||||||
$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK=0 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge 2>&1`;
|
$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK=0 $cmd --source F=$cnf,D=test,t=table_1 --where 1=1 --purge --version-check 2>&1`;
|
||||||
|
|
||||||
ok(
|
ok(
|
||||||
!-f $check_time_file,
|
!-f $check_time_file,
|
||||||
|
@@ -18,9 +18,6 @@ use File::Spec;
|
|||||||
use Time::HiRes qw(time);
|
use Time::HiRes qw(time);
|
||||||
require "$trunk/bin/pt-query-digest";
|
require "$trunk/bin/pt-query-digest";
|
||||||
|
|
||||||
# PerconaTest.pm sets this because normal tests shouldn't v-c.
|
|
||||||
delete $ENV{PERCONA_VERSION_CHECK};
|
|
||||||
|
|
||||||
my $output;
|
my $output;
|
||||||
my $cmd = "$trunk/bin/pt-query-digest --limit 1 $trunk/t/lib/samples/slowlogs/slow001.txt";
|
my $cmd = "$trunk/bin/pt-query-digest --limit 1 $trunk/t/lib/samples/slowlogs/slow001.txt";
|
||||||
|
|
||||||
@@ -29,7 +26,7 @@ my $dir = File::Spec->tmpdir();
|
|||||||
my $check_time_file = File::Spec->catfile($dir,'percona-toolkit-version-check');
|
my $check_time_file = File::Spec->catfile($dir,'percona-toolkit-version-check');
|
||||||
unlink $check_time_file if -f $check_time_file;
|
unlink $check_time_file if -f $check_time_file;
|
||||||
|
|
||||||
$output = `PTVCDEBUG=1 $cmd 2>&1`;
|
$output = `PTVCDEBUG=1 $cmd --version-check 2>&1`;
|
||||||
|
|
||||||
like(
|
like(
|
||||||
$output,
|
$output,
|
||||||
@@ -52,7 +49,7 @@ ok(
|
|||||||
# v-c file should limit checks to 1 per 24 hours
|
# v-c file should limit checks to 1 per 24 hours
|
||||||
# ###########################################################################
|
# ###########################################################################
|
||||||
|
|
||||||
$output = `PTVCDEBUG=1 $cmd 2>&1`;
|
$output = `PTVCDEBUG=1 $cmd --version-check 2>&1`;
|
||||||
|
|
||||||
like(
|
like(
|
||||||
$output,
|
$output,
|
||||||
@@ -68,7 +65,7 @@ unlink $check_time_file if -f $check_time_file;
|
|||||||
|
|
||||||
my $t0 = time;
|
my $t0 = time;
|
||||||
|
|
||||||
$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK_URL='http://x.percona.com' $cmd 2>&1`;
|
$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK_URL='http://x.percona.com' $cmd --version-check 2>&1`;
|
||||||
|
|
||||||
my $t = time - $t0;
|
my $t = time - $t0;
|
||||||
|
|
||||||
@@ -90,12 +87,13 @@ cmp_ok(
|
|||||||
);
|
);
|
||||||
|
|
||||||
# ###########################################################################
|
# ###########################################################################
|
||||||
# Disable the v-c.
|
# Disable the v-c (for now it's disabled by default, so by "disable" here
|
||||||
|
# we just mean "don't pass --version-check").
|
||||||
# ###########################################################################
|
# ###########################################################################
|
||||||
|
|
||||||
unlink $check_time_file if -f $check_time_file;
|
unlink $check_time_file if -f $check_time_file;
|
||||||
|
|
||||||
$output = `PTVCDEBUG=1 $cmd --no-version-check 2>&1`;
|
$output = `PTVCDEBUG=1 $cmd 2>&1`;
|
||||||
|
|
||||||
unlike(
|
unlike(
|
||||||
$output,
|
$output,
|
||||||
@@ -111,7 +109,7 @@ ok(
|
|||||||
# PERCONA_VERSION_CHECK=0 is handled in Pingback, so it will print a line
|
# PERCONA_VERSION_CHECK=0 is handled in Pingback, so it will print a line
|
||||||
# for PTVCDEBUG saying why it didn't run. So we just check that it doesn't
|
# for PTVCDEBUG saying why it didn't run. So we just check that it doesn't
|
||||||
# create the file which also signifies that it didn't run.
|
# create the file which also signifies that it didn't run.
|
||||||
$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK=0 $cmd 2>&1`;
|
$output = `PTVCDEBUG=1 PERCONA_VERSION_CHECK=0 $cmd --version-check 2>&1`;
|
||||||
|
|
||||||
ok(
|
ok(
|
||||||
!-f $check_time_file,
|
!-f $check_time_file,
|
||||||
|
Reference in New Issue
Block a user